l10n daemon script 75f3964db7 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-10-25 10:45:05 +00:00
..
drm	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-25 10:45:05 +00:00
fbdev	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-25 10:45:05 +00:00
hwcomposer	[hwcomposer] Rework the vsync code	2015-10-20 13:16:05 +02:00
virtual	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-25 10:45:05 +00:00
wayland	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-25 10:45:05 +00:00
x11	SVN_SILENT made messages (.desktop file) - always resolve ours	2015-10-25 10:45:05 +00:00
CMakeLists.txt