l10n daemon script 2806d5f625 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"		2019-09-19 05:25:09 +02:00
..
common	Use more traditional doxygen style	2019-07-29 22:06:19 +03:00
kwincompositing	Undo some recent cmake changes	2019-09-18 13:50:52 +03:00
kwindecoration	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00
kwindesktop	Undo some recent cmake changes	2019-09-18 13:50:52 +03:00
kwineffects	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-09-19 05:25:09 +02:00
kwinoptions	SVN_SILENT made messages (.desktop file) - always resolve ours	2019-09-19 05:25:09 +02:00
kwinrules	Undo some recent cmake changes	2019-09-18 13:50:52 +03:00
kwinscreenedges	Undo some recent cmake changes	2019-09-18 13:50:52 +03:00
kwinscripts	Undo some recent cmake changes	2019-09-18 13:50:52 +03:00
kwintabbox	Undo some recent cmake changes	2019-09-18 13:50:52 +03:00
CMakeLists.txt	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00