l10n daemon script 99237c9b3f 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-06-01 10:08:03 +00:00
..
CMakeLists.txt	[kcmkwin/scripts] Add missing ki18n_wrap_ui	2014-06-04 09:24:37 +02:00
kwinscripts.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-06-01 10:08:03 +00:00
kwinscripts.knsrc	Fix installation of GHNS material	2015-03-13 15:51:20 +01:00
main.cpp
Messages.sh
module.cpp	[kcmkwin/scripting] Fix DBus service name	2014-05-15 08:50:56 +02:00
module.h
module.ui
version.h.cmake