Merge branch 'master' into dev

This commit is contained in:
Joshua Davidson 2018-10-24 15:01:20 -04:00
commit 8999642bed
4 changed files with 52 additions and 52 deletions

View file

@ -6,7 +6,7 @@
##############################################
-->
<PropertyList include="Aircraft/Generic/Human/Include/walker-include.xml">
<PropertyList>
<sim>

View file

@ -33,56 +33,56 @@
<hrule/>
<group>
<layout>vbox</layout>
<text>
<halign>left</halign>
<label>A32X by it0uchpods Design Group</label>
</text>
<text>
<halign>left</halign>
<label>Joshua Davidson (it0uchpods), Jonanthan Redpath (legoboyvdlp), Thorsten Herrmann (TH-555)</label>
</text>
<hrule/>
<text>
<halign>left</halign>
<label>FDM: Joshua Davidson (it0uchpods)</label>
</text>
<text>
<halign>left</halign>
<label>Systems: Joshua Davidson (it0uchpods), Jonanthan Redpath (legoboyvdlp)</label>
</text>
<text>
<halign>left</halign>
<label>Cockpit: Thorsten Herrmann (TH-555), Joshua Davidson (it0uchpods), Jonanthan Redpath (legoboyvdlp)</label>
</text>
<text>
<halign>left</halign>
<label>Instruments: Joshua Davidson (it0uchpods), Jonanthan Redpath (legoboyvdlp)</label>
</text>
<text>
<halign>left</halign>
<label>Pre V1.0, Shared Libraries 1.5.0</label>
</text>
</group>
<group>
<layout>vbox</layout>
<hrule/>
<text>
<halign>left</halign>
<label>A32X by it0uchpods Design Group</label>
</text>
<text>
<halign>left</halign>
<label>Joshua Davidson (it0uchpods), Jonanthan Redpath (legoboyvdlp), Thorsten Herrmann (TH-555)</label>
</text>
<hrule/>
<text>
<halign>left</halign>
<label>FDM: Joshua Davidson (it0uchpods)</label>
</text>
<text>
<halign>left</halign>
<label>Systems: Joshua Davidson (it0uchpods), Jonanthan Redpath (legoboyvdlp)</label>
</text>
<text>
<halign>left</halign>
<label>Cockpit: Thorsten Herrmann (TH-555), Joshua Davidson (it0uchpods), Jonanthan Redpath (legoboyvdlp)</label>
</text>
<text>
<halign>left</halign>
<label>Instruments: Joshua Davidson (it0uchpods), Jonanthan Redpath (legoboyvdlp)</label>
</text>
<text>
<halign>left</halign>
<label>Pre V1.0, Shared Libraries 1.5.0</label>
</text>
<group>
<layout>hbox</layout>
<button>
<halign>center</halign>
<legend>Go Away</legend>
<pref-width>210</pref-width>
<binding>
<command>dialog-close</command>
</binding>
</button>
</group>
</group>
<hrule/>
<group>
<layout>hbox</layout>
<button>
<halign>center</halign>
<legend>Go Away</legend>
<pref-width>210</pref-width>
<binding>
<command>dialog-close</command>
</binding>
</button>
</group>
</PropertyList>

View file

@ -222,7 +222,7 @@
<repeatable>true</repeatable>
<binding>
<command>nasal</command>
<script>rmp.transfer(1);</script>
<script>rmp.transfer(2);</script>
<condition>
<and>
<greater-than-equals>

View file

@ -1 +1 @@
4683
4685