Philippe Renon 18725597f4 Merge branch 'next' of bitbucket.org:librepilot/librepilot into filnet/LP-29_osgearth_integration ...

Conflicts:
	artwork/3D Model/boards/coptercontrol/coptercontrol.3ds
	artwork/3D Model/multi/easy_quad/easy_quad_x.3ds
	artwork/3D Model/multi/mikrokopter/mk_l4-me.3ds
	artwork/3D Model/multi/ricoo/ricoo.3ds
	artwork/3D Model/multi/test_quad/test_quad_x.3ds
	ground/gcs/src/share/models/boards/coptercontrol/coptercontrol.3ds
	ground/gcs/src/share/models/multi/easy_quad/easy_quad_x.3ds
	ground/gcs/src/share/models/multi/mikrokopter/mk_l4-me.3ds
	ground/gcs/src/share/models/multi/ricoo/ricoo.3ds
	ground/gcs/src/share/models/multi/test_quad/test_quad_x.3ds

2015-09-19 14:42:38 +02:00

..

gcs

Merge branch 'next' of bitbucket.org:librepilot/librepilot into filnet/LP-29_osgearth_integration

2015-09-19 14:42:38 +02:00

uavobjgenerator

Merged in rbekken/librepilot/bug (pull request #18)

2015-08-09 21:01:58 +01:00

.gitattributes

OP-910: fix line endings and whitespaces (didn't work on Linux)

2013-06-05 23:21:54 +03:00

ground.pro

LP-1 - Rebranding

2015-08-04 16:55:12 +02:00