l10n daemon script b545785325 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"		2016-10-13 09:54:01 +00:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-10-13 09:54:01 +00:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-24 12:33:32 +00:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-08-29 11:48:37 +00:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-10-02 09:33:28 +00:00
kwinrules	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-10-02 09:33:28 +00:00
kwinscreenedges	Allow configuring script's screen edges from the KCM	2016-10-07 15:20:14 +01:00
kwinscripts	Use KPackage in kcmscripts	2016-10-07 13:27:19 +01:00
kwintabbox
CMakeLists.txt