l10n daemon script 818ed8f4ad 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-12-13 05:42:59 +01:00
..
CMakeLists.txt	Move X11Cursor into the x11standalone platform plugin	2016-08-19 10:57:09 +02:00
detectwidget.cpp	Move X11Cursor into the x11standalone platform plugin	2016-08-19 10:57:09 +02:00
detectwidget.h
detectwidget.ui
editshortcut.ui	Use resolve_kuit.py to clean i18n*	2014-08-21 13:17:37 +02:00
kcm.cpp	lazy setting of xbc properties on qApp	2015-05-15 23:55:28 +02:00
kcm.h
kwinrules.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-12-13 05:42:59 +01:00
kwinsrc.cpp	Move X11Cursor into the x11standalone platform plugin	2016-08-19 10:57:09 +02:00
main.cpp	set still required xcb properties in findRule	2015-06-03 21:22:38 +02:00
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	[kwin/kcms] Another round of kdialog removals	2014-03-18 09:11:07 +01:00
ruleswidget.cpp	[kwinrules] Hide all autogroup related widgets	2016-10-17 08:02:10 +02:00
ruleswidget.h	[kwinrules] Properly setting the value of the activity combo box	2016-09-24 19:17:20 +02:00
ruleswidgetbase.ui	Fix minor typo	2015-11-18 19:07:09 +02:00
yesnobox.h	Remove KDE/ prefix in include directories	2014-03-17 16:24:10 +01:00