James Cotton 8a6073fbaf Merge remote-tracking branch 'revo/revo-next' into testing ... Conflicts: Makefile flight/PiOS.osx/osx/Libraries/FreeRTOS/Source/portable/GCC/Posix/port.c flight/PiOS.osx/osx/Libraries/FreeRTOS/Source/task.c flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/portable/GCC/Posix/port_posix.c flight/PiOS.posix/posix/Libraries/FreeRTOS/Source/tasks.c flight/Revolution/Makefile ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro ground/openpilotgcs/src/plugins/uploader/devicewidget.cpp shared/uavobjectdefinition/taskinfo.xml		2012-05-28 09:13:26 -05:00
..
System	Merge remote-tracking branch 'revo/revo-next' into testing	2012-05-28 09:13:26 -05:00
Makefile	usb serial: refactor serial number construction	2012-05-19 16:15:47 -04:00