| commit | 8a6073fbafebb1ca84088f0bbd4226a8f9802114 | |
| author | James Cotton <peabody124@gmail.com> | |
| Mon, 28 May 2012 14:12:46 +0000 (28 09:12 -0500) | ||
| committer | James Cotton <peabody124@gmail.com> | |
| Mon, 28 May 2012 14:13:26 +0000 (28 09:13 -0500) | ||
| tree | abefa1882adb386361c1bcff1dc2b3ee295bcbe2 | treesnapshot (tar.gz zip) |
| parent | 1b53a9c4e69a373bd1a2cb5b75424ac3709783f2 | commitdiff |
| parent | 90e4047e2c5c654f9810cd48bc44e5ea8f88c9d9 | commitdiff |
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
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
13 files changed: