• dogmaphobic's avatar
    Merge remote-tracking branch 'origin/master' into buildWork · 5dbc0d5f
    dogmaphobic authored
    * origin/master:
      Fix meta data warnings
      Reduce iOS default font size. Tweak toolbar height for mobile.
      Token change to force a rebuild.
      Adding TTS to iOS
      Better UAVCAN instructions, better param meta
    
    Conflicts:
    	QGCApplication.pro
    	QGCCommon.pri
    5dbc0d5f
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...
.ycm_extra_conf.py 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...
QGCApplication.pro 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...
android_environment.sh Loading commit data...
demo-log.txt Loading commit data...
license.txt Loading commit data...
qgcresources.qrc Loading commit data...
qgcvideo.pro Loading commit data...
qgroundcontrol.desktop Loading commit data...
qgroundcontrol.pro Loading commit data...
qgroundcontrol.qrc Loading commit data...
qgroundcontrol.rc Loading commit data...
testlog.txt Loading commit data...
testlog2.txt Loading commit data...