Philippe Renon 33188bd78e Merge remote-tracking branch 'upstream/master' into next ... # Conflicts: # ground/gcs/src/plugins/coreplugin/connectionmanager.cpp		2016-12-13 00:56:32 +01:00
..
uavobjectdefinition	Merge remote-tracking branch 'upstream/master' into next	2016-12-13 00:56:32 +01:00
.gitattributes	Normalize line endings	2013-04-07 09:49:13 +03:00