1
0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-31 16:52:10 +01:00

Merge remote-tracking branch 'origin/skarlsso/OP-1459_workaround_white-box_issue' into next

This commit is contained in:
Fredrik Larrson 2014-09-08 02:33:39 +10:00
commit 11a4a249b8

View File

@ -1779,7 +1779,7 @@
<showTileGridLines>false</showTileGridLines> <showTileGridLines>false</showTileGridLines>
<uavSymbol>mapquad.png</uavSymbol> <uavSymbol>mapquad.png</uavSymbol>
<useMemoryCache>true</useMemoryCache> <useMemoryCache>true</useMemoryCache>
<useOpenGL>true</useOpenGL> <useOpenGL>false</useOpenGL>
</data> </data>
</Google__PCT__20Sat> </Google__PCT__20Sat>
<Memory__PCT__20Only> <Memory__PCT__20Only>
@ -1799,7 +1799,7 @@
<showTileGridLines>false</showTileGridLines> <showTileGridLines>false</showTileGridLines>
<uavSymbol>airplanepip.png</uavSymbol> <uavSymbol>airplanepip.png</uavSymbol>
<useMemoryCache>true</useMemoryCache> <useMemoryCache>true</useMemoryCache>
<useOpenGL>true</useOpenGL> <useOpenGL>false</useOpenGL>
</data> </data>
</Memory__PCT__20Only> </Memory__PCT__20Only>
<default> <default>
@ -1819,7 +1819,7 @@
<showTileGridLines>false</showTileGridLines> <showTileGridLines>false</showTileGridLines>
<uavSymbol>mapquad.png</uavSymbol> <uavSymbol>mapquad.png</uavSymbol>
<useMemoryCache>true</useMemoryCache> <useMemoryCache>true</useMemoryCache>
<useOpenGL>true</useOpenGL> <useOpenGL>false</useOpenGL>
</data> </data>
</default> </default>
</OPMapGadget> </OPMapGadget>