l10n daemon script b2bed00c82 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-10-02 12:02:41 +00: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
kcm.cpp
kcm.h
kwinrules.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-10-02 12:02:41 +00:00
kwinsrc.cpp	Move X11Cursor into the x11standalone platform plugin	2016-08-19 10:57:09 +02: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	[kwinrules] Properly setting the value of the activity combo box	2016-09-24 19:17:20 +02:00
ruleswidget.h	[kwinrules] Properly setting the value of the activity combo box	2016-09-24 19:17:20 +02:00
ruleswidgetbase.ui
yesnobox.h