commit b1807ebc0992fbdd4198e56fc4eec02888fa2a37
| author | 斟酌 鵬兄 <tgckpg@gmail.com> |
|---|
| date | 2016-03-16T11:06:34Z |
|---|
| subject | Merge remote-tracking branch 'origin/master' into Astro |
|---|
commit b1807ebc0992fbdd4198e56fc4eec02888fa2a37
Merge: ae6048e 3c887fe
Author: 斟酌 鵬兄 <tgckpg@gmail.com>
Date: 2016-03-16T11:06:34Z
Merge remote-tracking branch 'origin/master' into Astro
AD_LICENSE | 6 ++++++
botanjs/src/System/utils/Perf.js | 5 -----
botanjs/src/_this.js | 14 --------------
3 files changed, 6 insertions(+), 19 deletions(-)