l10n daemon script 25e6f46153 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-04-08 04:20:31 +02:00
..
aurorae	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-08 04:20:31 +02:00
decoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-04-08 04:20:31 +02:00
scripts
windowswitcher
CMakeLists.txt