Merge branch 'master' into dev

This commit is contained in:
Joshua Davidson 2018-09-30 13:58:25 -04:00
commit f1830c00c0
2 changed files with 2 additions and 2 deletions

View file

@ -500,7 +500,7 @@
<property>aero/qbar-psf</property> <property>aero/qbar-psf</property>
<property>metrics/Sw-sqft</property> <property>metrics/Sw-sqft</property>
<property>metrics/bw-ft</property> <property>metrics/bw-ft</property>
<property>fcs/rudder-pos-rad</property> <toradians><property>hydraulics/rudder/final-deg</property></toradians>
<value>0.01</value> <value>0.01</value>
</product> </product>
</function> </function>

View file

@ -1 +1 @@
4665 4666