Merge branch 'master' into dev

2018-10-24 15:01:20 -04:00 · 2018-10-24 15:01:20 -04:00 · 8999642bed
commit 8999642bed
parent 484b125c2d a17f0337fc
4 changed files with 52 additions and 52 deletions
--- a/A320-main.xml
+++ b/A320-main.xml
@ -6,7 +6,7 @@
 ##############################################
 -->

-<PropertyList include="Aircraft/Generic/Human/Include/walker-include.xml">
+<PropertyList>

 	<sim>

--- a/Models/Instruments/Radio/Radio2.xml
+++ b/Models/Instruments/Radio/Radio2.xml
@ -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>
--- a/revision.txt
+++ b/revision.txt
@ -1 +1 @@
-4683
+4685