l10n daemon script fcdc3e5a2c 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"		2016-11-04 09:48:38 +00:00
..
CMakeLists.txt
egl_hwcomposer_backend.cpp
egl_hwcomposer_backend.h
hwcomposer.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-11-04 09:48:38 +00:00
hwcomposer_backend.cpp
hwcomposer_backend.h	[platforms/hwcomposer] Set default old brightness to 50% (0x7f)	2016-08-18 17:59:07 +05:30
logging.cpp
logging.h
screens_hwcomposer.cpp
screens_hwcomposer.h