Philippe Renon c0613fe6d0 Adapted osgearth branch to msys2 ...

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

# Conflicts:
#	Makefile
#	ground/gcs/src/libs/osgearth/copydata.pro
#	make/tools.mk

2016-01-12 02:32:16 +01:00

..

src

Adapted osgearth branch to msys2

2016-01-12 02:32:16 +01:00

copydata.pro

LP-187 MSYS2: dont't explicitly specifiy qt spec

2016-01-10 17:11:46 +00:00

gcs.pri

LP-29 split osg and osgearth SDKs and make osgearth optional

2016-01-10 22:33:57 +01:00

gcs.pro

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

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