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-13 18:53:42 -05:00
2011-05-24 00:58:10 -04:00
2011-04-14 12:46:39 +00:00
2011-04-14 09:46:23 +00:00
2011-05-24 01:10:40 -04:00
2011-07-29 15:33:14 -04:00
2011-06-04 18:36:26 -05:00
2011-07-15 18:16:16 -05:00
2011-08-15 10:33:27 -05:00
2011-08-02 01:22:04 -04:00
2011-06-15 22:35:21 +03:00
2010-09-27 07:28:45 +00:00
2011-04-14 12:46:39 +00:00
2011-01-10 01:11:44 +00:00
2010-12-15 19:06:28 +00:00
2011-04-14 12:46:39 +00:00
2010-09-27 07:28:45 +00:00
2011-02-14 01:17:32 +00:00
2010-09-27 07:28:45 +00:00
2011-07-27 19:45:38 -04:00
2011-02-12 22:19:50 +00:00
2010-09-27 07:28:45 +00:00