Merge branch 'master' of https://github.com/esengine/egret-framework

Browse Source

# Conflicts:
#	demo/libs/framework/framework.d.ts
#	demo/libs/framework/framework.min.js
#	demo/src/game/MainScene.ts
#	source/bin/framework.d.ts
#	source/bin/framework.min.js

...

This commit is contained in:

YHH

2020-07-12 09:46:07 +08:00

parent 3f6ab79894 20392c8ab6

commit d9bb76c105

53 changed files with 2656 additions and 1222 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

913

source/bin/framework.js

File diff suppressed because it is too large Load Diff