James Cotton
dc340596f5
Merge branch 'next' into GCS_ChangesToUI-RuntimeCFG
Conflicts:
flight/CopterControl/Makefile
flight/OpenPilot/System/pios_board.c
flight/OpenPilot/UAVObjects.inc
flight/PiOS/STM32F10x/pios_spektrum.c
ground/openpilotgcs/src/plugins/config/config.pro
ground/openpilotgcs/src/plugins/config/configgadget.qrc
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
shared/uavobjectdefinition/hwsettings.xml
2011-08-27 15:26:05 -05:00
..
2011-08-14 17:25:52 +03:00
2011-01-26 16:49:21 +00:00
2011-01-26 16:49:21 +00:00
2011-01-26 16:49:21 +00:00
2011-08-27 15:26:05 -05:00
2011-06-19 00:50:38 +01:00
2011-08-14 17:25:52 +03:00
2011-08-23 11:25:28 +01:00
2011-06-19 00:50:38 +01:00
2011-08-14 17:25:52 +03:00
2011-06-26 12:18:00 +02:00
2011-06-26 12:18:00 +02:00
2011-05-15 22:48:18 +02:00
2011-07-27 19:39:08 +01:00
2011-08-14 17:25:52 +03:00
2011-01-22 17:40:26 +00:00
2011-01-31 21:50:11 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-05-29 09:51:39 +02:00
2011-05-29 09:42:26 +02:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00
2011-07-27 19:39:08 +01:00
2011-07-27 19:39:08 +01:00
2011-01-22 17:40:26 +00:00
2011-01-22 17:40:26 +00:00