13d389efd1
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" |
||
|---|---|---|
| .. | ||
| actions.ui | ||
| advanced.ui | ||
| AUTHORS | ||
| ChangeLog | ||
| CMakeLists.txt | ||
| focus.ui | ||
| kwinactions.desktop | ||
| kwinadvanced.desktop | ||
| kwinfocus.desktop | ||
| kwinmoving.desktop | ||
| kwinoptions.desktop | ||
| main.cpp | ||
| main.h | ||
| Messages.sh | ||
| mouse.cpp | ||
| mouse.h | ||
| mouse.ui | ||
| moving.ui | ||
| windows.cpp | ||
| windows.h | ||