c10fe06d06
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" |
||
|---|---|---|
| .. | ||
| CMakeLists.txt | ||
| egl_hwcomposer_backend.cpp | ||
| egl_hwcomposer_backend.h | ||
| hwcomposer.json | ||
| hwcomposer_backend.cpp | ||
| hwcomposer_backend.h | ||
| logging.cpp | ||
| logging.h | ||
| screens_hwcomposer.cpp | ||
| screens_hwcomposer.h | ||