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.
3f43a2ec5e
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" |
5 months ago | |
---|---|---|
.. | ||
package | 5 months ago | |
plugin | 3 years ago | |
CMakeLists.txt | 3 years ago | |
Messages.sh | 8 years ago |