l10n daemon script c59011af43 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-11-30 04:32:21 +01:00
..
common	Move querying the egl extensions into the AbstractEglBackend	2016-11-17 13:00:29 +01:00
standalone	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-11-30 04:32:21 +01:00
windowed	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-11-30 04:32:21 +01:00
CMakeLists.txt	Move the EglOnXBackend to the x11 platforms	2016-04-15 09:15:20 +02:00