l10n daemon script 38a5933249 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-15 09:48:16 +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-15 09:48:16 +00:00
windowed	SVN_SILENT made messages (.desktop file) - always resolve ours	2016-09-15 09:48:16 +00:00
CMakeLists.txt