l10n daemon script a10ed44aa0 SVN_SILENT made messages (.desktop file) - always resolve ours ... 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"		2015-12-29 11:30:35 +00:00
..
CMakeLists.txt
egl_hwcomposer_backend.cpp
egl_hwcomposer_backend.h
hwcomposer.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-12-29 11:30:35 +00:00
hwcomposer_backend.cpp
hwcomposer_backend.h
logging.cpp
logging.h
screens_hwcomposer.cpp
screens_hwcomposer.h