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.
8b1a5f27df
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" |
8 years ago | |
---|---|---|
.. | ||
kwincompositing | 8 years ago | |
kwindecoration | 8 years ago | |
kwindesktop | ||
kwinoptions | 8 years ago | |
kwinrules | 8 years ago | |
kwinscreenedges | ||
kwinscripts | ||
kwintabbox | ||
CMakeLists.txt |