a1c0d43deb
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" |
||
|---|---|---|
| .. | ||
| package | ||
| CMakeLists.txt | ||
| kcm_kwinrules.desktop | ||
| kcmrules.cpp | ||
| kcmrules.h | ||
| kwinsrc.cpp | ||
| main.cpp | ||
| Messages.sh | ||
| optionsmodel.cpp | ||
| optionsmodel.h | ||
| rulebookmodel.cpp | ||
| rulebookmodel.h | ||
| ruleitem.cpp | ||
| ruleitem.h | ||
| rulesdialog.cpp | ||
| rulesdialog.h | ||
| rulesmodel.cpp | ||
| rulesmodel.h | ||