Philippe Renon 617924e64d Merge remote-tracking branch 'origin/next' into filnet/OP-1122_gcs_waypoint_editor_stabilization ...

Conflicts:
	flight/uavobjects/uavobjectmanager.c
	ground/openpilotgcs/src/plugins/uavtalk/telemetrymanager.cpp
	ground/openpilotgcs/src/plugins/uavtalk/uavtalk.pro
	shared/uavobjectdefinition/pathaction.xml
	shared/uavobjectdefinition/waypoint.xml

2013-12-08 14:58:01 +01:00

..

libraries

Enabled printf-stdarg on all targets, implemented vsnprintf() (needed for logging)

2013-11-17 18:49:50 +01:00

modules

fixed enabled and disabled messages for logging in all cases

2013-12-01 00:03:24 +01:00

pios

Just uncrustification

2013-11-26 00:43:02 +01:00

Project

New CDC driver revsion

2013-08-17 04:04:22 +10:00

targets

Merge branch 'next' into corvuscorax/onboardlogging

2013-11-26 00:34:01 +01:00

templates

OP-770: add/rename some version-info.py template variables

2013-05-25 23:02:29 +02:00

tests/logfs

Reformat source code with 'make uncrustify_all' run twice. NO CODE CHANGES

2013-05-19 17:37:30 +03:00

uavobjects

Merge remote-tracking branch 'origin/next' into filnet/OP-1122_gcs_waypoint_editor_stabilization

2013-12-08 14:58:01 +01:00

uavtalk

OP-1122 OP-1125 fixed regression in flight side uavtalk introduced in a recent commit

2013-12-04 20:54:07 +01:00

.gitattributes

Update flight/.gitattributes to include *.template files

2013-04-30 22:15:58 +02:00