l10n daemon script 8b1a5f27df 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-06-23 21:12:32 +00:00
..
CMakeLists.txt
detectwidget.cpp	Port to CMake AUTOMOC	2016-02-01 21:05:36 +01:00
detectwidget.h
detectwidget.ui
editshortcut.ui
kcm.cpp
kcm.h
kwinrules.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-06-23 21:12:32 +00:00
kwinsrc.cpp	Split out pointer related handling from InputRedirection	2016-02-12 13:38:26 +01:00
main.cpp
Messages.sh
ruleslist.cpp	Port to CMake AUTOMOC	2016-02-01 21:05:36 +01:00
ruleslist.h
ruleslist.ui
ruleswidget.cpp	[Rules Widget] Change decoration fallback color from "Oxygen" to "Breeze"	2016-05-12 10:34:14 +02:00
ruleswidget.h
ruleswidgetbase.ui
yesnobox.h