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	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	2017-03-25 04:37:53 +01:00
kwinsrc.cpp	Move X11Cursor into the x11standalone platform plugin	2016-08-19 10:57:09 +02:00
main.cpp	Remove KWin::display from kwinglobals	2016-11-16 18:00:00 +01:00
Messages.sh
ruleslist.cpp
ruleslist.h
ruleslist.ui
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
yesnobox.h