James Cotton ef05cafaca Merge branch 'revolution' into altitudehold ...

Conflicts:
	flight/Libraries/insgps13state.c
	flight/OpenPilot/Makefile
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro

2012-01-01 10:50:35 -06:00

..

openpilotgcs

Merge branch 'revolution' into altitudehold

2012-01-01 10:50:35 -06:00

uavobjects

Fix 64-Bit Linux build problem in QT-Creator

2011-04-03 16:25:21 +00:00

uavobjgenerator

Merge branch 'next' into revolution_sensors

2011-12-18 16:28:30 -06:00

ground.pro

Change reference to svn by git (in comments, no code change)

2011-04-24 20:23:20 +03:00