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.
004a9aa6ea
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" |
7 years ago | |
---|---|---|
.. | ||
CMakeLists.txt | ||
aurorae.cpp | ||
aurorae.h | ||
kwin-packagestructure-aurorae.desktop | 7 years ago |