l10n daemon script 9040025acd 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"		2017-02-25 06:23:16 +01:00
..
drm
fbdev
hwcomposer
virtual	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-02-25 06:23:16 +01:00
wayland
x11
CMakeLists.txt