l10n daemon script 38a5933249 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-15 09:48:16 +00:00
..
drm	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-15 09:48:16 +00:00
fbdev	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-15 09:48:16 +00:00
hwcomposer	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-15 09:48:16 +00:00
virtual	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-15 09:48:16 +00:00
wayland	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-15 09:48:16 +00:00
x11	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-15 09:48:16 +00:00
CMakeLists.txt	Move the x11 plugin sources into a x11/windowed directory	2016-04-12 08:04:16 +02:00