kwin/effects/fade
l10n daemon script 429d15941e 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"
2017-02-20 06:00:53 +01:00
..
package SVN_SILENT made messages (.desktop file) - always resolve ours 2017-02-20 06:00:53 +01:00
CMakeLists.txt Add CMake variable to rename kwin binaries 2012-05-10 10:25:15 +02:00