l10n daemon script e65f7a349f 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-01-18 14:17:07 +00:00
..
drm
fbdev
hwcomposer
virtual
wayland
x11	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-01-18 14:17:07 +00:00
CMakeLists.txt