1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
LibrePilot/ground
James Cotton 96c2d24253 Merge branch 'next' into camera_stabilization
Conflicts:
	flight/CopterControl/Makefile
	flight/CopterControl/System/coptercontrol.c
	flight/Modules/Actuator/actuator.c
	flight/Modules/GPS/GPS.c
	flight/Modules/ManualControl/manualcontrol.c
	flight/Modules/Stabilization/stabilization.c
	flight/Modules/System/systemmod.c
	shared/uavobjectdefinition/manualcontrolsettings.xml
	shared/uavobjectdefinition/stabilizationdesired.xml
2011-07-30 10:06:10 +09:00
..
openpilotgcs Merge branch 'next' into camera_stabilization 2011-07-30 10:06:10 +09:00
uavobjects Fix 64-Bit Linux build problem in QT-Creator 2011-04-03 16:25:21 +00:00
uavobjgenerator Make object IDs depend on the names of any enums so if field names change then 2011-07-15 11:08:47 -05:00
ground.pro Change reference to svn by git (in comments, no code change) 2011-04-24 20:23:20 +03:00