l10n daemon script afc80b580a 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-08-30 08:05:15 +02:00
..
drm	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-30 08:05:15 +02:00
fbdev	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-30 08:05:15 +02:00
hwcomposer	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-30 08:05:15 +02:00
virtual	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-30 08:05:15 +02:00
wayland	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-30 08:05:15 +02:00
x11	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-30 08:05:15 +02:00
CMakeLists.txt	Hide the Linux specific parts behind check for headers	2017-07-24 16:19:27 +02:00