Philippe Renon 72c7623a1b Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration ...

# Conflicts:
#	ground/gcs/src/libs/osgearth/osgearth.pro

2016-01-06 22:16:32 +01:00

..

src

Merge remote-tracking branch 'upstream/next' into filnet/LP-29_osgearth_integration

2016-01-06 22:16:32 +01:00

copydata.pro

LP-2 fix copydata.pro for linux 32 using scope

2015-12-14 22:14:22 +01:00

gcs.pri

LP-29 compile with libc++ on osx to fix issues when linking with osg

2015-12-02 23:16:05 +01:00

gcs.pro

LP-1: moved openpilotgcs.pri to gcs.pri

2015-08-02 19:36:39 +01:00