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.
9bf7ad4a9f
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" |
9 years ago | |
|---|---|---|
| .. | ||
| drm | 9 years ago | |
| fbdev | 9 years ago | |
| hwcomposer | 9 years ago | |
| virtual | 9 years ago | |
| wayland | 9 years ago | |
| x11 | 9 years ago | |
| CMakeLists.txt | 9 years ago | |