kwin/kcmkwin/kwinrules
l10n daemon script e8fe3f2fb7 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-06-20 05:27:25 +02:00
..
CMakeLists.txt
detectwidget.cpp
detectwidget.h
detectwidget.ui
editshortcut.ui
kcm.cpp
kcm.h
kwinrules.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 2019-06-20 05:27:25 +02:00
kwinsrc.cpp
main.cpp
Messages.sh
ruleslist.cpp Port window specific rules dialog to DBus 2018-12-31 07:58:12 +01:00
ruleslist.h
ruleslist.ui
ruleswidget.cpp
ruleswidget.h
ruleswidgetbase.ui
yesnobox.h