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
..
bin	OP-719: fix +x for openpilotgcs on linux	2013-04-14 14:09:46 +03:00
share	Merge branch 'next' into translations_next	2013-12-23 13:02:27 +01:00
src	Merge branch 'next' into translations_next	2013-12-23 13:02:27 +01:00
copydata.pro	git merge next	2013-12-18 20:14:26 +01:00
openpilotgcs.pri	[OP-835] Qt 5.1.0 - fixed ((packed)) pragma issue introduced by MinGW upgrade	2013-09-15 23:39:48 +02:00
openpilotgcs.pro	git merge next	2013-12-18 20:14:26 +01:00