Laurent Lalanne bdbbaa4f93 Merge branch 'next' into translations_next ... Conflicts: ground/openpilotgcs/src/libs/utils/logfile.cpp ground/openpilotgcs/src/libs/utils/logfile.h ground/openpilotgcs/src/plugins/coreplugin/aboutdialog.cpp ground/openpilotgcs/src/plugins/coreplugin/aboutdialog.h ground/openpilotgcs/src/plugins/telemetry/monitorwidget.h ground/openpilotgcs/src/plugins/telemetry/telemetry_global.h		2013-12-23 13:02:27 +01:00
..
openpilotgcs	Merge branch 'next' into translations_next	2013-12-23 13:02:27 +01:00
share.pro	OP-772: Normalize line endings	2013-04-05 23:46:56 +03:00