l10n daemon script e68356831b 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-04-22 05:43:11 +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-04-22 05:43:11 +02:00
windowed	SVN_SILENT made messages (.desktop file) - always resolve ours	2017-12-13 07:01:42 +01:00
CMakeLists.txt