Merge branch 'master' into ECAM-sys-develop

This commit is contained in:
Joshua Davidson 2018-07-15 23:14:34 -04:00
commit 9c2f7f0d11

View file

@ -81,8 +81,8 @@
</product> </product>
</function> </function>
<function name="aero/force/Lift_pitch_trim_control"> <function name="aero/force/Lift_elevator_trim_control">
<description>Lift due to pitch trim control deflection</description> <description>Lift due to elevator trim control deflection</description>
<product> <product>
<property>aero/qbar-psf</property> <property>aero/qbar-psf</property>
<property>metrics/Sw-sqft</property> <property>metrics/Sw-sqft</property>
@ -250,8 +250,8 @@
</product> </product>
</function> </function>
<function name="aero/force/Drag_pitch_trim_control"> <function name="aero/force/Drag_elevator_trim_control">
<description>Drag due to pitch trim control deflection</description> <description>Drag due to elevator trim control deflection</description>
<product> <product>
<property>aero/qbar-psf</property> <property>aero/qbar-psf</property>
<property>metrics/Sw-sqft</property> <property>metrics/Sw-sqft</property>