Philippe Renon 664e79c9e0 Merge branch 'filnet/OP-843_settings_dialog_show_language_selection_at_top' into next ... Conflicts: ground/openpilotgcs/src/plugins/coreplugin/dialogs/settingsdialog.cpp		2013-06-21 22:10:06 +02:00
..
openpilotgcs	Merge branch 'filnet/OP-843_settings_dialog_show_language_selection_at_top' into next	2013-06-21 22:10:06 +02:00
share.pro	OP-772: Normalize line endings	2013-04-05 23:46:56 +03:00