kwin/kcmkwin/kwinrules
l10n daemon script 64658c9d37 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"
2019-01-16 09:09:19 +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 2019-01-16 09:09:19 +01:00
kwinsrc.cpp Move X11Cursor into the x11standalone platform plugin 2016-08-19 10:57:09 +02:00
main.cpp Disable window rule configuration for Wayland 2018-02-21 18:06:47 +01:00
Messages.sh
ruleslist.cpp kcmkwinrules: Fix window title 2017-10-15 18:36:38 +03:00
ruleslist.h
ruleslist.ui
ruleswidget.cpp [kcmkwin/ruleswidget] Disable "Detect" button when countdown is running 2018-10-12 13:51:25 +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