1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-05 16:46:06 +01:00
LibrePilot/flight
James Cotton 6bfb2a5e45 Merge branch 'next' into revo
Conflicts:
	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapgraphicitem.cpp
	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/mapripper.cpp
	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.cpp
	ground/openpilotgcs/src/libs/opmapcontrol/src/mapwidget/waypointitem.h
	ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
	ground/openpilotgcs/src/libs/utils/coordinateconversions.h
	ground/openpilotgcs/src/plugins/opmap/opmap.pro
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
	ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.h
	ground/openpilotgcs/src/plugins/uavobjectwidgetutils/configtaskwidget.cpp
	shared/uavobjectdefinition/taskinfo.xml
	shared/uavobjectdefinition/waypoint.xml
2012-09-01 16:18:03 -05:00
..
board_hw_defs Fixed a typo on I2C speed for the MS5611 2012-08-25 12:28:25 +02:00
Bootloaders Merge branch 'next' into revo 2012-06-07 12:45:06 -05:00
CopterControl Merge branch 'next' into revo 2012-08-19 21:22:02 -05: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 branch 'next' into revo 2012-08-12 14:38:38 -05:00
Modules Merge branch 'next' into revo 2012-09-01 16:18:03 -05:00
OpenPilot/System Merged latest origin/next. 2012-05-05 09:40:44 -07:00
PiOS Merge branch 'next' into revo 2012-09-01 16:18:03 -05:00
PiOS.osx Add pios_struct_helper to PiOS.osx 2012-07-23 09:19:28 -05:00
PiOS.posix Merge branch 'next' into revo 2012-09-01 16:18:03 -05:00
PiOS.win32 Merge branch 'next' into revo 2012-09-01 16:18:03 -05:00
PipXtreme Merge branch 'next' into revo 2012-09-01 16:18:03 -05: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 Fixes the selection of the oversample settings from the pios_ms5611_cfg.oversapling configuration 2012-08-25 11:29:01 +02:00
SimPosix Re-enabled simposix SDCard support, and removed obsolete SDCard alarm usage from System module 2012-08-01 19:53:59 +09:30
UAVObjects taskinfo: also track Event thread's stack usage and CPU utilization 2012-08-11 18:47:03 -04:00
UAVTalk Fix a really stupid bug where I ordered two cases together; 2012-07-24 11:07:40 -05:00
README.txt Says all it needs to say for now. 2009-12-22 05:07:27 +00:00

Check the wiki