Oleg Semyonov de6e450b5f Merge branch 'next' into os/TxPID-module ... Conflicts: flight/CopterControl/Makefile flight/CopterControl/System/coptercontrol.c ground/uavobjgenerator/generators/generator_common.h shared/uavobjectdefinition/hwsettings.xml component free heap used ---------------------------- Nothing 2544 - PWM 2416 128 PPM 2392 152 DSM 2448 96 S.Bus 2432 112 GPS (port only) 2352 192 GPS (port+module) 1296 1248 CameraStab 2080 464 Telemetry 1912 632 TxPID 2272 272		2011-11-13 16:25:58 +02:00
..
System	Merge branch 'next' into CC_GPS	2011-11-11 11:44:11 +01:00
Makefile	Merge branch 'next' into os/TxPID-module	2011-11-13 16:25:58 +02:00