l10n daemon script 6bb9f6db7b 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-11-17 13:07:36 +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-11-17 13:07:36 +00:00
kwinscripts.knsrc	Fix installation of GHNS material	2015-03-13 15:51:20 +01:00
main.cpp	Remove KDE/ prefix in include directories	2014-03-17 16:24:10 +01:00
Messages.sh	Import of a KCM for KWin scripts	2011-12-21 07:28:51 +01:00
module.cpp	[kcmkwin/scripting] Fix DBus service name	2014-05-15 08:50:56 +02:00
module.h	Remove KDE/ prefix in include directories	2014-03-17 16:24:10 +01:00
module.ui	Drop KDE4Support in kde-workspace/kwin	2013-12-05 20:24:02 +01:00
version.h.cmake	Import of a KCM for KWin scripts	2011-12-21 07:28:51 +01:00