Merge branch 'dev'

Browse Source

Conflicts:
	targets/f18/api_symbols.csv

...

This commit is contained in:

RebornedBrain

2023-12-28 15:30:47 +03:00

parent d55652deff c9e3f20314

commit 13fe87259f

23 changed files with 286 additions and 136 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

assets/icons/About/CertificationChina0_121x41.png Normal file

Binary file not shown.

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

BIN

assets/icons/About/CertificationChina1_122x47.png Normal file

Binary file not shown.

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

BIN

assets/icons/About/CertificationMexico_98x41.png Normal file

Binary file not shown.

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

BIN

assets/icons/About/CertificationTaiwan_33x32.png Normal file

Binary file not shown.

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

2

assets/protobuf

Submodule assets/protobuf updated: 23ad19a756...1956b83bba