l10n daemon script 3b3aa82f58 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"		2018-07-23 05:24:40 +02:00
..
CMakeLists.txt	Add a method to dbus interface to query information about a window	2018-02-25 14:12:04 +01:00
detectwidget.cpp	Add a method to dbus interface to query information about a window	2018-02-25 14:12:04 +01:00
detectwidget.h	Add a method to dbus interface to query information about a window	2018-02-25 14:12:04 +01:00
detectwidget.ui
editshortcut.ui
kcm.cpp	Remove Qt module declarations in includes	2018-06-05 18:07:23 +01:00
kcm.h
kwinrules.desktop	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 05:24:40 +02:00
kwinsrc.cpp	Move X11Cursor into the x11standalone platform plugin	2016-08-19 10:57:09 +02:00
main.cpp	Remove Qt module declarations in includes	2018-06-05 18:07:23 +01:00
Messages.sh
ruleslist.cpp	kcmkwinrules: Fix window title	2017-10-15 18:36:38 +03:00
ruleslist.h
ruleslist.ui
ruleswidget.cpp	Revert "Revert "Add "SkipSwitcher" to API""	2018-05-23 23:33:39 -05:00
ruleswidget.h	Add a new desktopfile name rule	2018-03-18 09:15:15 +01:00
ruleswidgetbase.ui	Add a new desktopfile name rule	2018-03-18 09:15:15 +01:00
yesnobox.h