l10n daemon script 3b3aa82f58 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"		2018-07-23 05:24:40 +02:00
..
common	Move SceneOpenGL into a dedicated plugin	2017-09-30 13:12:10 +02:00
standalone	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 05:24:40 +02:00
windowed	SVN_SILENT made messages (.desktop file) - always resolve ours	2018-07-23 05:24:40 +02:00
CMakeLists.txt	Move the EglOnXBackend to the x11 platforms	2016-04-15 09:15:20 +02:00