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
..
boards	Merge remote-tracking branch 'upstream/master' into next	2016-12-13 00:56:32 +01:00
common	LP-72 Uncrustify	2016-05-28 18:02:15 +02:00