You cannot select more than 25 topics Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
l10n daemon script 866dfb4e89 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"
4 years ago
..
package SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
CMakeLists.txt
Messages.sh
kcm_kwinrules.desktop SVN_SILENT made messages (.desktop file) - always resolve ours 4 years ago
kcmrules.cpp
kcmrules.h
kwinsrc.cpp
main.cpp
optionsmodel.cpp
optionsmodel.h
rulebookmodel.cpp
rulebookmodel.h
ruleitem.cpp
ruleitem.h
rulesdialog.cpp
rulesdialog.h
rulesmodel.cpp
rulesmodel.h