1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-30 08:24:11 +01:00
LibrePilot/flight
Stacey Sheldon 9a5ba841cf Merge remote-tracking branch 'op-public/next' into revo-next
Conflicts:
	ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
	ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
	ground/openpilotgcs/src/plugins/hitlnew/xplanesimulator.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
	ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
	shared/uavobjectdefinition/pathaction.xml
	shared/uavobjectdefinition/waypointactive.xml
2012-09-15 19:55:47 -04:00
..
board_hw_defs Merge remote-tracking branch 'op-public/next' into revo-next 2012-08-20 21:22:02 -04:00
Bootloaders Merge remote-tracking branch 'op-public/next' into revo-next 2012-06-10 19:01:11 -04:00
CopterControl Merge remote-tracking branch 'op-public/next' into revo-next 2012-08-20 21:22:02 -04:00
Doc Merged latest origin/next. 2012-05-05 09:40:44 -07:00
EntireFlash makefile: add additional context to output when building all_* targets 2012-06-20 23:38:21 -04:00
Libraries Merge remote-tracking branch 'op-public/next' into revo-next 2012-08-20 21:22:02 -04:00
Modules Revert "Removed Revolution specific code" 2012-08-25 14:57:16 -04:00
OpenPilot/System Merged latest origin/next. 2012-05-05 09:40:44 -07:00
OSD Just some tests/fixes 2012-07-30 11:47:34 +03:00
PiOS Merge remote-tracking branch 'op-public/next' into revo-next 2012-08-20 21:22:02 -04:00
PiOS.osx Add pios_struct_helper to PiOS.osx 2012-07-24 15:15:37 +02:00
PiOS.posix Merge remote-tracking branch 'op-public/next' into revo-next 2012-08-20 21:22:02 -04:00
PiOS.win32 Merge remote-tracking branch 'op-public/next' into revo-next 2012-08-20 21:22:02 -04:00
PipXtreme Fix output power selection from the configured value at startup 2012-08-21 18:51:45 +02:00
Project gdb: add gdb setup file for simposix 2012-07-07 10:36:36 -04:00
RemoteSystemsTempFiles Merge branch 'next' into MikeL 2012-06-04 16:59:31 -07:00
Revolution sdcard: build fixes for revo due to sdcard removal 2012-08-20 21:32:19 -04:00
SimPosix Merge remote-tracking branch 'op-public/next' into revo-next 2012-07-22 23:39:37 -04:00
UAVObjects taskinfo: also track Event thread's stack usage and CPU utilization 2012-08-11 18:47:03 -04:00
UAVTalk Exposed the Send ACK/NACK function in UAVTalk. 2012-05-02 20:42:37 -07:00
README.txt Says all it needs to say for now. 2009-12-22 05:07:27 +00:00

Check the wiki