l10n daemon script b56a28e19c 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-14 09:23:44 +00:00
..
common	[platforms/x11] Fix init of EGL/X11	2016-07-21 09:42:01 +02:00
standalone	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-14 09:23:44 +00:00
windowed	[platforms/x11] Support output removal in nested setup	2016-08-08 09:24:44 +02:00
CMakeLists.txt	Move the EglOnXBackend to the x11 platforms	2016-04-15 09:15:20 +02:00