l10n daemon script c244ee5e3e 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"		2018-10-07 06:07:19 +02:00
..
aurorae
decoration
effect	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-10-07 06:07:19 +02:00
scripts
windowswitcher
CMakeLists.txt	[effects] Make scripted effects GHNS-able	2018-09-28 20:17:30 +03:00