l10n daemon script 475af42e37 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-09-27 09:13:10 +02:00
..
aurorae
decoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-28 04:30:46 +02:00
scripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-28 04:30:46 +02:00
windowswitcher	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-09-27 09:13:10 +02:00
CMakeLists.txt