l10n daemon script 30b516eceb 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"		2020-09-30 06:16:48 +02:00
..
drm	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
fbdev	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
hwcomposer	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
virtual	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
wayland	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
x11	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-09-30 06:16:48 +02:00
CMakeLists.txt	Cleanup style in CMakeLists.txt files	2019-09-17 16:03:05 +03:00