Philippe Renon 617924e64d Merge remote-tracking branch 'origin/next' into filnet/OP-1122_gcs_waypoint_editor_stabilization ...

Conflicts:
	flight/uavobjects/uavobjectmanager.c
	ground/openpilotgcs/src/plugins/uavtalk/telemetrymanager.cpp
	ground/openpilotgcs/src/plugins/uavtalk/uavtalk.pro
	shared/uavobjectdefinition/pathaction.xml
	shared/uavobjectdefinition/waypoint.xml

2013-12-08 14:58:01 +01:00

..

bin

OP-719: fix +x for openpilotgcs on linux

2013-04-14 14:09:46 +03:00

share

Merge remote-tracking branch 'origin/next' into filnet/telemetry

2013-12-07 16:39:19 +01:00

src

Merge remote-tracking branch 'origin/next' into filnet/OP-1122_gcs_waypoint_editor_stabilization

2013-12-08 14:58:01 +01:00

copydata.pro

Merge remote-tracking branch 'origin/shared/OP-1109_qtquick2' into next

2013-12-03 22:47:12 +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

OP-1103 Some minor cleanup work and adding a version check for Qt5.1

2013-11-13 21:04:57 +11:00