Stacey Sheldon
|
2119067722
|
Merge remote-tracking branch 'op-revo/james/revo' into revo-next
Conflicts:
Makefile
flight/Modules/Attitude/revolution/attitude.c
flight/Modules/Battery/battery.c
flight/Modules/FixedWingPathFollower/fixedwingpathfollower.c
flight/Modules/GPS/GPS.c
flight/Modules/ManualControl/inc/manualcontrol.h
flight/Modules/ManualControl/manualcontrol.c
flight/Modules/OveroSync/overosync.c
flight/Modules/PathPlanner/inc/pathplanner.h
flight/Modules/PathPlanner/pathplanner.c
flight/Modules/Sensors/sensors.c
flight/Modules/VtolPathFollower/vtolpathfollower.c
flight/PiOS/Boards/STM32F4xx_Revolution.h
flight/PiOS/Boards/pios_board.h
flight/PiOS/STM32F4xx/library.mk
flight/PiOS/inc/pios_hmc5883.h
flight/PiOS/inc/pios_l3gd20.h
flight/PiOS/inc/pios_rfm22b_priv.h
flight/Revolution/Makefile
flight/Revolution/Makefile.osx
flight/Revolution/System/inc/pios_config.h
flight/Revolution/UAVObjects.inc
ground/openpilotgcs/src/libs/utils/coordinateconversions.cpp
ground/openpilotgcs/src/libs/utils/homelocationutil.cpp
ground/openpilotgcs/src/libs/utils/homelocationutil.h
ground/openpilotgcs/src/plugins/config/configrevowidget.cpp
ground/openpilotgcs/src/plugins/hitlnew/il2simulator.cpp
ground/openpilotgcs/src/plugins/opmap/opmapgadgetwidget.cpp
ground/openpilotgcs/src/plugins/plugins.pro
ground/openpilotgcs/src/plugins/uavobjects/uavobjects.pro
package/Makefile
shared/uavobjectdefinition/fixedwingpathfollowersettings.xml
shared/uavobjectdefinition/fixedwingpathfollowerstatus.xml
shared/uavobjectdefinition/flightstatus.xml
shared/uavobjectdefinition/hwsettings.xml
shared/uavobjectdefinition/manualcontrolsettings.xml
shared/uavobjectdefinition/pathdesired.xml
shared/uavobjectdefinition/vtolpathfollowersettings.xml
shared/uavobjectdefinition/waypoint.xml
|
2012-10-30 00:08:43 -04:00 |
|
James Cotton
|
0559c90689
|
OSX packaging: Finally link SDL in properly.
|
2012-10-13 18:03:18 +01:00 |
|
James Cotton
|
0e111a62ff
|
OSX Packaging: Make sure to link libgamepad to the distributed SDL
|
2012-10-10 08:30:55 -05:00 |
|
James Cotton
|
b074b1f712
|
Work on the OSX packaging to get it working for revo and to package OSG.
|
2012-06-13 12:30:07 -05:00 |
|
James Cotton
|
353fe8b349
|
Need to link a few new libraries for the QML stuff
|
2012-02-14 22:05:20 -06:00 |
|
James Cotton
|
7990d209a8
|
Fix package deployment script for OSX to make sure the SVG pixmap shows up
|
2012-01-31 14:48:24 -06:00 |
|
James Cotton
|
041d713045
|
OSX Packaging: Make the base package file bigger but then resize after copying
|
2011-08-04 19:03:55 -05:00 |
|
James Cotton
|
7d8842e9a0
|
OSX Packaging: Also need to include QtTest for debug build
|
2011-08-04 18:07:52 -05:00 |
|
James Cotton
|
76b833e409
|
Change the OSX packaging to grab the correct Qt path
|
2011-08-04 13:15:41 -05:00 |
|
James Cotton
|
86997c5c3e
|
Small fix for OSX packaging which makes the SDL library be included. Should
fix error message about missing GCS Control.
|
2011-07-14 13:56:48 -05:00 |
|
James Cotton
|
2f6fe11924
|
Fix for OSX packaging with PlugIns
|
2011-06-01 14:02:59 -05:00 |
|
James Cotton
|
bac56d23a9
|
Merge branch 'master' of ssh://git.openpilot.org/OpenPilot
|
2011-05-28 04:05:58 -05:00 |
|
Oleg Semyonov
|
3dec910954
|
package: now it is called 'make package' instead of 'make release'
|
2011-05-28 03:14:51 +03:00 |
|