• dogmaphobic's avatar
    Merge remote-tracking branch 'MavLink/master' into androidStayOn · bd34b73a
    dogmaphobic authored
    * MavLink/master:
      Sqlite for Linux
      Update fact meta data for PX4
      Get rid of View menu
      Flickable in Offline Maps Reorder of headers
      Add missing header
      Fix binding
      Add mission header
      Add missing header
      ComplexMissionItem support for Survey
      Header re-structuring
      Raise min Qt version to 5.5+
    
    Conflicts:
    	src/Vehicle/MultiVehicleManager.cc
    bd34b73a
Name
Last commit
Last update
android Loading commit data...
debian Loading commit data...
deploy Loading commit data...
doc Loading commit data...
flightgear Loading commit data...
ios Loading commit data...
libs Loading commit data...
resources Loading commit data...
src Loading commit data...
test Loading commit data...
tools Loading commit data...
.appveyor.yml Loading commit data...
.gitignore Loading commit data...
.gitmodules Loading commit data...
.travis.yml Loading commit data...
.vagrantconfig.yml Loading commit data...
.ycm_extra_conf.py Loading commit data...
CONTRIBUTING.md Loading commit data...
CodingStyle.cc Loading commit data...
CodingStyle.h Loading commit data...
CodingStyle.qml Loading commit data...
Custom-Info.plist Loading commit data...
Google_Play_Android_Developer-bb93ae7d61ca.p12.enc Loading commit data...
QGCCommon.pri Loading commit data...
QGCExternalLibs.pri Loading commit data...
QGCInstaller.pri Loading commit data...
QGCSetup.pri Loading commit data...
README.md Loading commit data...
Vagrantfile Loading commit data...
android_environment.sh Loading commit data...
demo-log.txt Loading commit data...
installheader.bmp Loading commit data...
license.txt Loading commit data...
qgcresources.qrc Loading commit data...
qgroundcontrol.desktop Loading commit data...
qgroundcontrol.pro Loading commit data...
qgroundcontrol.qrc Loading commit data...
testlog.txt Loading commit data...
testlog2.txt Loading commit data...