l10n daemon script ba0b34c755 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-11-22 06:02:11 +01: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-11-22 06:02:11 +01:00
kwinsrc.cpp
main.cpp	Remove Qt module declarations in includes	2018-06-05 18:07:23 +01:00
Messages.sh
ruleslist.cpp
ruleslist.h
ruleslist.ui
ruleswidget.cpp	Merge branch 'Plasma/5.12' into Plasma/5.14	2018-10-12 13:54:24 +02: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