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	Use xcb_cursor library instead of Xlib based one in Cursor	2015-02-06 13:41:18 +01:00
detectwidget.cpp	lazy setting of xbc properties on qApp	2015-05-15 23:55:28 +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	2015-06-01 10:08:03 +00:00
kwinsrc.cpp	InputRedirection emits a signal when the modifiers change	2014-03-19 14:14:56 +01:00
main.cpp	lazy setting of xbc properties on qApp	2015-05-15 23:55:28 +02:00
Messages.sh	Fix extraction of two messages in kcmkwinrules	2015-04-09 22:47:37 +03:00
ruleslist.cpp	[kwin] Fix includes of kde4support headers	2014-03-18 14:34:36 +01:00
ruleslist.h
ruleslist.ui
ruleswidget.cpp	Fix invalid escape sequence	2014-03-25 22:17:15 +01:00
ruleswidget.h
ruleswidgetbase.ui	Fix misaligned combo box in window rules kcm	2014-09-15 16:19:50 +02:00
yesnobox.h