Public Git Hosting - librepilot.git/commit

commit	33188bd78e028e4d09b221c1faa28ceda9026c8f
author	Philippe Renon <philippe_renon@yahoo.fr>
	Mon, 12 Dec 2016 23:56:32 +0000 (13 00:56 +0100)
committer	Philippe Renon <philippe_renon@yahoo.fr>
	Mon, 12 Dec 2016 23:56:32 +0000 (13 00:56 +0100)
tree	8d479ba48e300ec4341998a257f49ce2804f036d	tree \| snapshot (tar.gz zip)
parent	bfd4d824b74400dad8204062e0be0bb2f24b3f7a	commit \| diff
parent	4952aa59583187f3e807cff7d8df5a4e2680e963	commit \| diff

Merge remote-tracking branch 'upstream/master' into next

# Conflicts:
# ground/gcs/src/plugins/coreplugin/connectionmanager.cpp

Makefile	diff1 \|	diff2 \|	blob \| history
flight/pios/common/pios_com.c	diff1 \|	diff2 \|	blob \| history
flight/pios/inc/pios_com.h	diff1 \|	diff2 \|	blob \| history
ground/gcs/src/plugins/config/configinputwidget.cpp	diff1 \|	diff2 \|	blob \| history
ground/gcs/src/plugins/config/configinputwidget.h	diff1 \|	diff2 \|	blob \| history
ground/gcs/src/plugins/coreplugin/connectionmanager.cpp	diff1 \|	diff2 \|	blob \| history
ground/gcs/src/plugins/uploader/uploader.pro	diff1 \|	diff2 \|	blob \| history