l10n daemon script a00f1f3ad4 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"		2015-04-21 13:24:50 +00:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-04-21 13:24:50 +00:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-04-07 13:20:00 +00:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-04-07 13:20:00 +00:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-04-07 13:20:00 +00:00
kwinrules	Fix extraction of two messages in kcmkwinrules	2015-04-09 22:47:37 +03:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-04-07 13:20:00 +00:00
kwinscripts	Fix installation of GHNS material	2015-03-13 15:51:20 +01:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-04-07 13:20:00 +00:00
CMakeLists.txt	Drop build option KWIN_BUILD_SCREENEDGES	2014-11-24 10:48:49 +01:00