lp:~neon/kajongg/master
- Get this branch:
- bzr branch lp:~neon/kajongg/master
Branch merges
Branch information
Import details
This branch is an import of the HEAD branch of the Git repository at git://anongit.kde.org/kajongg.
Last successful import was .
Recent revisions
- 3781. By Yuri Chornoivan <email address hidden>
-
Fix blurry icons by adding UseHighDpiPixmaps flag
Diffrential revision: https:/
/phabricator. kde.org/ D29681 - 3780. By l10n daemon script <email address hidden>
-
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop" - 3779. By l10n daemon script <email address hidden>
-
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop" - 3777. By l10n daemon script <email address hidden>
-
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop" - 3775. By Antonio Rojas <email address hidden>
-
Fix DESTDIR usage
kajongg's build system uses DESTDIR during cmake to construct the command that creates the kajongg and kajonggserver symlinks in bindir.
This is a problem for distributions, which usually have separated cmake/make/make install stages with DESTDIR only available in the later one.
So distros are currently working around this in different ways, either creating the symlinks manually after make install (Gentoo, Fedora) or defining DESTDIR before running cmake (Arch, Opensuse).This patch changes the symlink installation process to only make the DESTDIR substitution during make install.
Differential Revision: https:/
/phabricator. kde.org/ D27330 - 3773. By l10n daemon script <email address hidden>
-
SVN_SILENT made messages (.desktop file) - always resolve ours
In case of conflict in i18n, keep the version of the branch "ours"
To resolve a particular conflict, "git checkout --ours path/to/file.desktop"
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)