Merge branch 'master' into dev

This commit is contained in:
Joshua Davidson 2018-09-29 16:09:41 -04:00
commit 09ded96e57
6 changed files with 7097 additions and 7096 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 659 KiB

After

Width:  |  Height:  |  Size: 670 KiB

File diff suppressed because it is too large Load diff

Binary file not shown.

Before

Width:  |  Height:  |  Size: 313 KiB

After

Width:  |  Height:  |  Size: 311 KiB

File diff suppressed because it is too large Load diff

View file

@ -404,7 +404,7 @@ var canvas_upperECAM_base = {
}
flaps3 = flaps3_ovr.getValue();
flaps_position = flaps_pos.getValue();
flaps_position = flap_pos.getValue();
if (flaps3 != 1 and flaps_position == 5) {
me["LDG_Flaps"].setText("FLAPS FULL");
me["LDG_Flaps_B"].hide();

View file

@ -1 +1 @@
4662
4664