Laurent Lalanne 9e3d464523 Merge branch 'master' into translations_next ...

Conflicts:
	ground/openpilotgcs/copydata.pro
	ground/openpilotgcs/share/openpilotgcs/translations/openpilotgcs_fr.ts

2013-10-25 11:27:28 +02:00

..

openpilotgcs

Merge branch 'master' into translations_next

2013-10-25 11:27:28 +02:00

uavobject-synthetics

Normalize line endings

2013-04-07 09:49:13 +03:00

uavobjgenerator

Merge remote-tracking branch 'origin/filnet/qt5.1.0' into next

2013-10-17 22:00:54 +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

Normalize line endings

2013-04-07 09:49:13 +03:00