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

..

gcs

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

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

uavobjgenerator

uncrustify

2016-01-04 21:41:45 +01:00

usagetracker/backend

GCS: Add backend for usagetracker.

2015-09-23 17:10:01 +02: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