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

..

aggregation

LP-29 renamed ground/openpilotgcs to gcs

2015-08-29 15:29:51 +02:00

eigen

LP-29 renamed ground/openpilotgcs to gcs

2015-08-29 15:29:51 +02:00

extensionsystem

LP-29 renamed ground/openpilotgcs to gcs

2015-08-29 15:29:51 +02:00

glc_lib

LP-29 renamed ground/openpilotgcs to gcs

2015-08-29 15:29:51 +02:00

juavobjects

LP-29 renamed ground/openpilotgcs to gcs

2015-08-29 15:29:51 +02:00

juavtalk

LP-29 renamed ground/openpilotgcs to gcs

2015-08-29 15:29:51 +02:00

opmapcontrol

LP-29 use QOpenGLWidget in place of depecrated QGLWidget

2015-12-09 08:32:04 +01:00

osgearth

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

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

qscispinbox

LP-29 renamed ground/openpilotgcs to gcs

2015-08-29 15:29:51 +02:00

qtconcurrent

LP-29 renamed ground/openpilotgcs to gcs

2015-08-29 15:29:51 +02:00

qwt

LP-29 renamed ground/openpilotgcs to gcs

2015-08-29 15:29:51 +02:00

sdlgamepad

LP-29 renamed ground/openpilotgcs to gcs

2015-08-29 15:29:51 +02:00

utils

Merged in filnet/librepilot/shared/LP-2_qt5_5_upgrade (pull request #112)

2015-12-09 22:04:19 +01:00

version_info

Fixed remaining OpenPilot Wiki Links

2015-10-07 06:18:47 +01:00

libs.pro

LP-2 temporarilly disable glc_lib (and moldeview) as it does not link with Qt 5.5.x

2015-12-02 09:05:14 +01:00