l10n daemon script afc80b580a 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"		2017-08-30 08:05:15 +02:00
..
common	Move the X11 specific OverlayWindow into the platform/x11	2017-08-12 11:32:29 +02:00
standalone	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-30 08:05:15 +02:00
windowed	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-08-30 08:05:15 +02:00
CMakeLists.txt	Move the EglOnXBackend to the x11 platforms	2016-04-15 09:15:20 +02:00