l10n daemon script 5ca26de280 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"		2017-01-22 07:26:36 +01:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-01-16 07:52:59 +01:00
kwindecoration	Restore global menu support	2017-01-11 10:21:03 +01:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-20 13:30:44 +01:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-20 13:30:44 +01:00
kwinrules	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-20 13:30:44 +01:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-20 13:30:44 +01:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-01-22 07:26:36 +01:00
kwintabbox	use proper packagestructures	2017-01-20 15:34:56 +01:00
CMakeLists.txt	Drop build option KWIN_BUILD_SCREENEDGES	2014-11-24 10:48:49 +01:00