Merge branch 'develop' into add-e2c-to-more-factions

Browse Source

...

This commit is contained in:

SnappyComebacks

2021-03-27 11:04:13 -06:00

parent e660726828 49e729e9ec

commit ca7a86b6d7

22 changed files with 241 additions and 53 deletions

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

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

BIN

resources/ui/units/aircrafts/banners/F-22A_24.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 21 KiB

BIN

resources/ui/units/aircrafts/icons/F-22A_24.jpg Normal file

Binary file not shown.

Side by Side After Width:  |  Height:  |  Size: 1.1 KiB