l10n daemon script ec11cfd04f 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-07-30 04:57:22 +02:00
..
aurorae	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-07-30 04:57:22 +02:00
decoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-07-30 04:57:22 +02:00
scripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-07-26 08:52:42 +02:00
windowswitcher	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-07-26 08:52:42 +02:00
CMakeLists.txt