Stefan Karlsson 454d491e48 Merge branch 'next' into skarlsso/OP-1397_add_responsiveness_to_txpid ...

Conflicts:
	ground/openpilotgcs/src/plugins/config/configtxpidwidget.cpp
	ground/openpilotgcs/src/plugins/config/configtxpidwidget.h

2014-08-10 10:06:44 +02:00

..

libraries

Merge branch 'next' into andrecillo/OP-1317_IMU_wind_estimation

2014-08-09 10:43:48 +02:00

modules

Merge branch 'next' into skarlsso/OP-1397_add_responsiveness_to_txpid

2014-08-10 10:06:44 +02:00

pios

Merge branch 'next' into andrecillo/OP-1317_IMU_wind_estimation

2014-08-09 10:43:48 +02:00

Project

New CDC driver revsion

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

targets

Merge branch 'next' into andrecillo/OP-1317_IMU_wind_estimation

2014-08-09 10:43:48 +02:00

templates

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

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

tests/logfs

uncrustify

2014-06-22 20:34:04 +02:00

uavobjects

OP-943 uses pios_mem API for heap allocation

2014-06-11 22:15:40 +02:00

uavtalk

OP-943 uses pios_mem API for heap allocation

2014-06-11 22:15:40 +02:00

.gitattributes

Update flight/.gitattributes to include *.template files

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