l10n daemon script 8dd23c5054 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"		2018-07-12 07:07:30 +02:00
..
kwincompositing	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-12 07:07:30 +02:00
kwindecoration	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-18 07:25:30 +02:00
kwindesktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-20 07:06:47 +01:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-28 04:45:41 +01:00
kwinrules	Revert "Add "SkipSwitcher" to API"	2018-04-28 09:26:51 +02:00
kwinscreenedges	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-25 07:18:34 +02:00
kwinscripts	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-18 07:25:30 +02:00
kwintabbox	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-06-18 07:25:30 +02:00
CMakeLists.txt	Drop build option KWIN_BUILD_SCREENEDGES	2014-11-24 10:48:49 +01:00