1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2024-11-29 07:24:13 +01:00
LibrePilot/ground
Richard von Lehe f3611591e0 Merge branch 'next' into rvonlehe/OP-1740_UAV0_GetSetFunctionsTakeEnum
Conflicts:
	flight/modules/PathFollower/inc/vtollandcontroller.h
	flight/modules/PathFollower/vtollandcontroller.cpp
	flight/modules/PathFollower/vtollandfsm.cpp
2015-04-26 17:45:36 -05:00
..
openpilotgcs OP-1337 Translations : input wizard update 2015-04-26 18:25:56 +02:00
uavobject-synthetics OP-1792 Makefile tidy: Fix up the 'copydata.pro's to depend on FORCE, not be FORCE, and be aux template, not subdirs template. 2015-03-31 14:57:43 +13:00
uavobjgenerator OP-1740: GetSet use enums. Need to pack the enums to retain byte compatibility. 2015-04-20 08:31:26 -05:00
.gitattributes OP-910: fix line endings and whitespaces (didn't work on Linux) 2013-06-05 23:21:54 +03:00
ground.pro git merge next 2013-12-18 20:14:26 +01:00