m_thread 7bcdff9f2f Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard ... Conflicts: ground/openpilotgcs/src/plugins/setupwizard/setupwizard.cpp ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationhelper.cpp ground/openpilotgcs/src/plugins/setupwizard/vehicleconfigurationsource.h		2014-09-23 22:30:49 +02:00
..
libraries	Merge remote-tracking branch 'origin/next' into thread/OP-1222_FW_Wizard	2014-09-22 23:05:21 +02:00
modules	Merge branch 'next' into corvuscorax/OP-1483_leaky-integrals-and-post-filtering	2014-09-23 13:54:33 +02:00
pios	Revert "Merge remote-tracking branch 'origin/proff/OP-1373_DSMFixes' into next"	2014-09-08 02:31:02 +10:00
Project	New CDC driver revsion	2013-08-17 04:04:22 +10:00
targets	Merge remote-tracking branch 'origin/skarlsso/OP-1493_discoveryf4bare_support_in_gcs' into next	2014-09-23 21:11:15 +10:00
templates	OP-770: add/rename some version-info.py template variables	2013-05-25 23:02:29 +02:00
tests	OP-1474 Extract line and curve functions out to mathmisc.h, nan check and unit tests	2014-09-10 00:34:06 +02:00
uavobjects	OP-1456 fixed macro for uav object field to array casting and added compile time asserts to assure its working	2014-08-24 16:19:15 +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