l10n daemon script b160c5babb 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"		2017-03-25 04:37:53 +01:00
..
CMakeLists.txt
detectwidget.cpp	Move X11Cursor into the x11standalone platform plugin	2016-08-19 10:57:09 +02:00
detectwidget.h
detectwidget.ui	[kwinrules] workaround for assert in QFormLayout	2013-09-30 09:55:13 +02:00
editshortcut.ui
kcm.cpp
kcm.h	[kwinrules] slots/signals -> Q_SLOTS/Q_SIGNALS	2013-09-30 08:01:46 +02:00
kwinrules.desktop
kwinsrc.cpp
main.cpp
Messages.sh	Fix extraction of two messages in kcmkwinrules	2015-04-09 22:47:37 +03:00
ruleslist.cpp	Port to CMake AUTOMOC	2016-02-01 21:05:36 +01:00
ruleslist.h
ruleslist.ui
ruleswidget.cpp	[kwinrules] Hide all autogroup related widgets	2016-10-17 08:02:10 +02:00
ruleswidget.h
ruleswidgetbase.ui
yesnobox.h