l10n daemon script 5ebbc6a7a3 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-03-05 09:55:50 +00:00
..
drm	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-03-05 09:55:50 +00:00
fbdev	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-03-05 09:55:50 +00:00
hwcomposer	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-03-05 09:55:50 +00:00
virtual	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-03-05 09:55:50 +00:00
wayland	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-03-05 09:55:50 +00:00
x11	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-03-05 09:55:50 +00:00
CMakeLists.txt	Only compile VirtualTerminal if libinput is found	2015-12-01 07:57:39 +01:00