l10n daemon script b56a28e19c 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-09-14 09:23:44 +00:00
..
drm	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-14 09:23:44 +00:00
fbdev	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-14 09:23:44 +00:00
hwcomposer	[platforms/hwcomposer] Set default old brightness to 50% (0x7f)	2016-08-18 17:59:07 +05:30
virtual	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-14 09:23:44 +00:00
wayland	Support restarting the OpenGL compositor on Wayland	2016-07-20 14:08:23 +02:00
x11	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-14 09:23:44 +00:00
CMakeLists.txt