Merge branch 'master' into dev

This commit is contained in:
Joshua Davidson 2018-11-09 15:55:05 -05:00
commit 6c5ce66852
2 changed files with 3 additions and 3 deletions

View file

@ -169,7 +169,7 @@
</equals>
</condition>
<property>/it-autoflight/internal/lookahead-15-sec-mach</property>
<scale>1000.0</scale>
<scale>750.0</scale>
</input>
<reference>
<condition>
@ -188,7 +188,7 @@
</equals>
</condition>
<property>/it-autoflight/internal/flch-mach</property>
<scale>1000.0</scale>
<scale>750.0</scale>
</reference>
<output>/it-autoflight/internal/target-fpm-b</output>
<config>

View file

@ -1 +1 @@
4698
4699