l10n daemon script e4ba37109f 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"		2019-06-09 05:13:32 +02:00
..
aurorae	Move package structure plugins to plugins dir	2019-03-11 10:57:13 +02:00
decoration	Move package structure plugins to plugins dir	2019-03-11 10:57:13 +02:00
effect	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-06-09 05:13:32 +02:00
scripts	Move package structure plugins to plugins dir	2019-03-11 10:57:13 +02:00
windowswitcher	Move package structure plugins to plugins dir	2019-03-11 10:57:13 +02:00
CMakeLists.txt	Move package structure plugins to plugins dir	2019-03-11 10:57:13 +02:00