Merge branch 'dev-mac' of github.com:pixhawk/qgroundcontrol into dev-mac

aa5f67d4 · lm · 10ad437c · 33da8692 · aa5f67d4 · aa5f67d4
Commit aa5f67d4 authored Jul 14, 2011 by lm
--- a/src/libs/opmapcontrol/src/internals/projections/lks94projection.cpp
+++ b/src/libs/opmapcontrol/src/internals/projections/lks94projection.cpp
--- a/src/libs/opmapcontrol/src/internals/projections/lks94projection.h
+++ b/src/libs/opmapcontrol/src/internals/projections/lks94projection.h
--- a/src/libs/opmapcontrol/src/internals/projections/mercatorprojection.cpp
+++ b/src/libs/opmapcontrol/src/internals/projections/mercatorprojection.cpp
--- a/src/libs/opmapcontrol/src/internals/projections/mercatorprojection.h
+++ b/src/libs/opmapcontrol/src/internals/projections/mercatorprojection.h
--- a/src/libs/opmapcontrol/src/internals/projections/mercatorprojectionyandex.cpp
+++ b/src/libs/opmapcontrol/src/internals/projections/mercatorprojectionyandex.cpp
--- a/src/libs/opmapcontrol/src/internals/projections/mercatorprojectionyandex.h
+++ b/src/libs/opmapcontrol/src/internals/projections/mercatorprojectionyandex.h
--- a/src/libs/opmapcontrol/src/internals/projections/platecarreeprojection.cpp
+++ b/src/libs/opmapcontrol/src/internals/projections/platecarreeprojection.cpp
--- a/src/libs/opmapcontrol/src/internals/projections/platecarreeprojection.h
+++ b/src/libs/opmapcontrol/src/internals/projections/platecarreeprojection.h
--- a/src/libs/opmapcontrol/src/internals/projections/platecarreeprojectionpergo.cpp
+++ b/src/libs/opmapcontrol/src/internals/projections/platecarreeprojectionpergo.cpp
--- a/src/libs/opmapcontrol/src/internals/projections/platecarreeprojectionpergo.h
+++ b/src/libs/opmapcontrol/src/internals/projections/platecarreeprojectionpergo.h
--- a/src/libs/opmapcontrol/src/internals/pureprojection.cpp
+++ b/src/libs/opmapcontrol/src/internals/pureprojection.cpp
--- a/src/libs/opmapcontrol/src/internals/pureprojection.h
+++ b/src/libs/opmapcontrol/src/internals/pureprojection.h
--- a/src/libs/opmapcontrol/src/internals/rectangle.cpp
+++ b/src/libs/opmapcontrol/src/internals/rectangle.cpp
--- a/src/libs/opmapcontrol/src/internals/rectangle.h
+++ b/src/libs/opmapcontrol/src/internals/rectangle.h
--- a/src/libs/opmapcontrol/src/internals/rectlatlng.cpp
+++ b/src/libs/opmapcontrol/src/internals/rectlatlng.cpp
--- a/src/libs/opmapcontrol/src/internals/rectlatlng.h
+++ b/src/libs/opmapcontrol/src/internals/rectlatlng.h
--- a/src/libs/opmapcontrol/src/internals/sizelatlng.cpp
+++ b/src/libs/opmapcontrol/src/internals/sizelatlng.cpp
--- a/src/libs/opmapcontrol/src/internals/sizelatlng.h
+++ b/src/libs/opmapcontrol/src/internals/sizelatlng.h
--- a/src/libs/opmapcontrol/src/internals/tile.cpp
+++ b/src/libs/opmapcontrol/src/internals/tile.cpp
--- a/src/libs/opmapcontrol/src/internals/tile.h
+++ b/src/libs/opmapcontrol/src/internals/tile.h