l10n daemon script 6ae917d7f8 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-09-13 10:27:05 +00:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-13 10:27:05 +00:00
kwindecoration	grid layout for windowdecoration KCM	2016-09-06 16:22:56 +02: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-06-23 23:41:42 +00:00
kwinrules	Move X11Cursor into the x11standalone platform plugin	2016-08-19 10:57:09 +02:00
kwinscreenedges	Support triggering application launcher through screenedge	2016-08-10 20:39:28 +02:00
kwinscripts	pedantic fixes	2016-07-16 13:14:44 -04:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-08-06 12:43:39 +00:00
CMakeLists.txt