Merge remote-tracking branch 'khopa/master' into develop_2_2_x

Browse Source

# Conflicts:
#	changelog.md
#	game/operation/operation.py
#	gen/aircraft.py
#	gen/groundobjectsgen.py
#	qt_ui/uiconstants.py

...

This commit is contained in:

Khopa 2020-11-14 21:40:07 +01:00

parent f8735927bf 41445c3092

commit 696710bf41

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available