Skip to content
Snippets Groups Projects
Commit 4f29a871 authored by James Cook's avatar James Cook
Browse files

merge

parents 67e7a127 391535a5
Branches
Tags
No related merge requests found
......@@ -3,7 +3,7 @@
legacy_header_height="18"
can_dock="true"
can_close="true"
can_minimize="true"
can_minimize="false"
center_horiz="true"
follows="bottom"
height="110"
......@@ -38,7 +38,7 @@
Fly Backwards (press Down Arrow or S)
</string>
<panel
border="true"
border="false"
height="83"
follows="left|top"
layout="topleft"
......@@ -136,7 +136,7 @@
</panel>
<!-- Width and height of this panel should be synchronized with panel_stand_stop_flying.xml -->
<panel
border="true"
border="false"
height="27"
layout="topleft"
left="0"
......
<?xml version="1.0" encoding="utf-8" standalone="yes" ?>
<!-- Optional parameters:
border - show border around panel
bg_opaque_image - image name for "in-front" panel look
bg_alpha_image - image name for "in-back" or transparent panel look
-->
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment