This commit and the previous merge attempts to align my tree with upstream changes. It works for me but apologies in advance if i break anything

.gitignore

@@ -15,6 +15,5 @@ qrc_*.cpp
 tmp
 debug
 release
-opengroundcontrol.xcodeproj/**
-opengroundcontrol
+qgroundcontrol.xcodeproj/**
 qgroundcontrol

MAVLink

@@ -1 +0,0 @@
-Subproject commit 92e5a9f5d7deafebe8f19f5f1462995f77cce300

README

@@ -5,8 +5,12 @@ http://pixhawk.ethz.ch
 To build on Mac OS X (10.5 or later):
 1) Install http://www.libsdl.org/release/SDL-1.2.14.dmg
 2) Install Qt 4.6.2 with Cocoa http://get.qt.nokia.com/qt/source/qt-mac-cocoa-opensource-4.6.2.dmg
-3) Run qmake
-4) Run "xcodebuild -configuration Release" or open "opengroundcontrol.xcodeproj" in Xcode and build.
+3) Run "qmake"
+4) Run "xcodebuild -configuration Release" or open "qgroundcontrol.xcodeproj" in Xcode and build.
 
+To build on Linux:
+<instructions to be written>
 
+To build on Windows:
+<instructions to be written>
 

mavground.pri

@@ -69,7 +69,7 @@ macx {
 
     DESTDIR = $$BASEDIR/bin/mac
     INCLUDEPATH += -framework SDL \
-        $$BASEDIR/MAVLink/src
+        $$BASEDIR/../mavlink/src
 
     LIBS += -framework IOKit \
         -framework SDL \