l10n daemon script 29915632df 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-06-04 05:12:36 +02:00
..
common	Revert "[platforms/x11] Remove triple buffering detection"	2020-01-16 10:00:20 +01:00
standalone	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-04 05:12:36 +02:00
windowed	SVN_SILENT made messages (.desktop file) - always resolve ours	2020-06-04 05:12:36 +02:00
CMakeLists.txt