l10n daemon script 3b3aa82f58 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"		2018-07-23 05:24:40 +02:00
..
CMakeLists.txt
egl_hwcomposer_backend.cpp
egl_hwcomposer_backend.h
hwcomposer.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 05:24:40 +02:00
hwcomposer_backend.cpp	[platforms/hwcomposer] Set value of surfaceDamage.numRects to 0	2017-11-02 10:21:37 +05:30
hwcomposer_backend.h
logging.cpp
logging.h
screens_hwcomposer.cpp
screens_hwcomposer.h