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
..
src	Merge branch 'next' of bitbucket.org:librepilot/librepilot into filnet/LP-29_osgearth_integration	2015-09-19 14:42:38 +02:00
copydata.pro	Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration	2015-08-29 17:03:48 +02:00
gcs.pri	Merged in filnet/librepilot/filnet/LP-29_osgearth_integration (pull request #12)	2015-09-04 09:46:21 +02:00
gcs.pro	LP-1: moved openpilotgcs.pri to gcs.pri	2015-08-02 19:36:39 +01:00