kwin/packageplugins
l10n daemon script b7f6e57eff 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-01-14 05:39:00 +01:00
..
aurorae Use override 2018-12-03 18:26:56 +05:30
decoration Use override 2018-12-03 18:26:56 +05:30
effect SVN_SILENT made messages (.desktop file) - always resolve ours 2019-01-14 05:39:00 +01:00
scripts Use override 2018-12-03 18:26:56 +05:30
windowswitcher Use override 2018-12-03 18:26:56 +05:30
CMakeLists.txt [effects] Make scripted effects GHNS-able 2018-09-28 20:17:30 +03:00