Skip to content
Commit 5dbc0d5f authored by dogmaphobic's avatar dogmaphobic
Browse files

Merge remote-tracking branch 'origin/master' into buildWork

* 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
parents b1940863 ed55e5da
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment