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.
b65d504a49
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 | |
|---|---|---|
| .. | ||
| opengl | 7 years ago | |
| qpainter | ||
| xrender | ||
| CMakeLists.txt | ||