James Cotton 75db0fcb35 Merge branch 'next' into revo ...

Conflicts:
	flight/Modules/GPS/GPS.c
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/systemalarms.xml

2012-08-12 14:38:38 -05:00

..

System

Merge branch 'next' into revo

2012-08-12 14:38:38 -05:00

Makefile

Fixes to PipX firmware to compile with non codesourcery compiler.

2012-07-14 08:18:21 -07:00