l10n daemon script a3c7eac1b8 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-05-14 10:21:14 +00:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-05-14 10:21:14 +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-24 09:53:59 +00:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-04-07 13:20:00 +00:00
kwinrules	[kcmkwin/rules] Fix kdeinit_kwin_rules_dialog crashing on start	2015-04-23 09:36:31 +02:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-05-14 10:21:14 +00:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-05-14 10:21:14 +00: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