Skip to content

Q
qgroundcontrol
Commit fc71fe94 authored by Lionel Heng's avatar Lionel Heng
Browse files
Options

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

parents 1b796433 3b24c21b
Expand all Show whitespace changes
Inline Side-by-side
Showing with 384 additions and 0 deletions
images/mapproviders/googleearth.svg 0 → 100644
View file @ fc71fe94
This diff is collapsed.
mavground.qrc
View file @ fc71fe94
...@@ -83,6 +83,7 @@ ...@@ -83,6 +83,7 @@
<file>images/mapproviders/google.png</file> <file>images/mapproviders/google.png</file>
<file>images/mapproviders/yahoo.png</file> <file>images/mapproviders/yahoo.png</file>
<file>images/earth.html</file> <file>images/earth.html</file>
<file>images/mapproviders/googleearth.svg</file>
</qresource> </qresource>
<qresource prefix="/general"> <qresource prefix="/general">
<file alias="vera.ttf">images/Vera.ttf</file> <file alias="vera.ttf">images/Vera.ttf</file>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment