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/core/pureimagecache.h
+++ b/src/libs/opmapcontrol/src/core/pureimagecache.h
--- a/src/libs/opmapcontrol/src/core/rawtile.cpp
+++ b/src/libs/opmapcontrol/src/core/rawtile.cpp
--- a/src/libs/opmapcontrol/src/core/rawtile.h
+++ b/src/libs/opmapcontrol/src/core/rawtile.h
--- a/src/libs/opmapcontrol/src/core/size.cpp
+++ b/src/libs/opmapcontrol/src/core/size.cpp
--- a/src/libs/opmapcontrol/src/core/size.h
+++ b/src/libs/opmapcontrol/src/core/size.h
--- a/src/libs/opmapcontrol/src/core/tilecachequeue.cpp
+++ b/src/libs/opmapcontrol/src/core/tilecachequeue.cpp
--- a/src/libs/opmapcontrol/src/core/tilecachequeue.h
+++ b/src/libs/opmapcontrol/src/core/tilecachequeue.h
--- a/src/libs/opmapcontrol/src/core/urlfactory.cpp
+++ b/src/libs/opmapcontrol/src/core/urlfactory.cpp
--- a/src/libs/opmapcontrol/src/core/urlfactory.h
+++ b/src/libs/opmapcontrol/src/core/urlfactory.h
--- a/src/libs/opmapcontrol/src/internals/MouseWheelZoomType.cpp
+++ b/src/libs/opmapcontrol/src/internals/MouseWheelZoomType.cpp
--- a/src/libs/opmapcontrol/src/internals/copyrightstrings.h
+++ b/src/libs/opmapcontrol/src/internals/copyrightstrings.h
--- a/src/libs/opmapcontrol/src/internals/core.cpp
+++ b/src/libs/opmapcontrol/src/internals/core.cpp
--- a/src/libs/opmapcontrol/src/internals/core.h
+++ b/src/libs/opmapcontrol/src/internals/core.h
--- a/src/libs/opmapcontrol/src/internals/debugheader.h
+++ b/src/libs/opmapcontrol/src/internals/debugheader.h
--- a/src/libs/opmapcontrol/src/internals/internals.pro
+++ b/src/libs/opmapcontrol/src/internals/internals.pro
--- a/src/libs/opmapcontrol/src/internals/loadtask.cpp
+++ b/src/libs/opmapcontrol/src/internals/loadtask.cpp
--- a/src/libs/opmapcontrol/src/internals/loadtask.h
+++ b/src/libs/opmapcontrol/src/internals/loadtask.h
--- a/src/libs/opmapcontrol/src/internals/mousewheelzoomtype.h
+++ b/src/libs/opmapcontrol/src/internals/mousewheelzoomtype.h
--- a/src/libs/opmapcontrol/src/internals/pointlatlng.cpp
+++ b/src/libs/opmapcontrol/src/internals/pointlatlng.cpp
--- a/src/libs/opmapcontrol/src/internals/pointlatlng.h
+++ b/src/libs/opmapcontrol/src/internals/pointlatlng.h