commit 13b3288b74128a737ef0a70ea209028bb6de66fd
| author | 斟酌 鵬兄 <tgckpg@gmail.com> |
|---|
| date | 2017-10-26T08:22:38Z |
|---|
| subject | Merge remote-tracking branch 'origin/master' into Astro |
|---|
commit 13b3288b74128a737ef0a70ea209028bb6de66fd
Merge: e2cec00 7ab3fa3
Author: 斟酌 鵬兄 <tgckpg@gmail.com>
Date: 2017-10-26T08:22:38Z
Merge remote-tracking branch 'origin/master' into Astro
AD_LICENSE | 1 +
botanjs/service/jclassresv.py | 14 +++++------
botanjs/service/webapi.py | 9 +++++--
botanjs/src/System/Compression/Zlib.js | 34 +++++++++++++++++++++++++
botanjs/src/System/Compression/_this.js | 3 +++
botanjs/src/System/Encoding/Base64.js | 16 ++++++++++++
botanjs/src/System/Encoding/Utf8.js | 35 ++++++++++++++++++++++++++
botanjs/src/System/Encoding/_this.js | 3 +++
botanjs/src/System/Net/ClassLoader.js | 27 ++++++++++----------
botanjs/src/System/_this.js | 2 +-
botanjs/src/_this.js | 13 +++++++---
botanjs/src/externs/System.Compression.Zlib.js | 8 ++++++
botanjs/src/externs/System.Compression.js | 2 ++
botanjs/src/externs/System.Encoding.Base64.js | 4 +++
botanjs/src/externs/System.Encoding.Utf8.js | 4 +++
botanjs/src/externs/System.Encoding.js | 2 ++
16 files changed, 149 insertions(+), 28 deletions(-)