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	[backends/hwcomposer] Drop dependency on hybrissync library	2015-10-14 14:33:49 +02:00
egl_hwcomposer_backend.cpp	Add pure virtual OpenGLBackend::init() method	2015-11-26 08:33:07 +01:00
egl_hwcomposer_backend.h	Add pure virtual OpenGLBackend::init() method	2015-11-26 08:33:07 +01:00
hwcomposer.json	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-12-29 11:30:35 +00:00
hwcomposer_backend.cpp	[backends/hwcomposer] Announce support for DPMS	2015-11-23 11:48:39 +01:00
hwcomposer_backend.h	[backends/hwcomposer] Announce support for DPMS	2015-11-23 11:48:39 +01:00
logging.cpp	Change default logging category to QtCriticalMsg	2015-07-31 13:29:58 +02:00
logging.h
screens_hwcomposer.cpp	[backends/hwcomposer] Base HwcomposerScreens on BasicScreens	2015-11-17 10:49:09 +01:00
screens_hwcomposer.h	[backends/hwcomposer] Base HwcomposerScreens on BasicScreens	2015-11-17 10:49:09 +01:00