Merge branch 'dev' of pixhawk.ethz.ch:qgroundcontrol into dev

fc71fe94 · Lionel Heng · 1b796433 · 3b24c21b · fc71fe94 · fc71fe94
Commit fc71fe94 authored Dec 05, 2010 by Lionel Heng
Expand all Hide whitespace changes
Inline Side-by-side

Showing with 384 additions and 0 deletions

googleearth.svg images/mapproviders/googleearth.svg +383 -0

mavground.qrc mavground.qrc +1 -0

No files found.
--- a/images/mapproviders/googleearth.svg
+++ b/images/mapproviders/googleearth.svg
--- a/mavground.qrc
+++ b/mavground.qrc
@@ -83,6 +83,7 @@
        <file>images/mapproviders/google.png</file>
        <file>images/mapproviders/yahoo.png</file>
        <file>images/earth.html</file>
+        <file>images/mapproviders/googleearth.svg</file>
    </qresource>
    <qresource prefix="/general">
        <file alias="vera.ttf">images/Vera.ttf</file>