Commit Graph

11 Commits

Author SHA1 Message Date
minggo f08555248f fix conflict 2022-01-24 17:23:03 +08:00
Yun Hsiao Wu 14a17c9d22 license upgrade (#4210) 2022-01-24 17:18:47 +08:00
Yun Hsiao Wu e0fdfef054 license upgrader 2021-02-05 14:08:22 +08:00
minggo 0386bed212 fix audio code format (#3212)
* fix audio code format

* format base files
2021-01-13 13:38:07 +08:00
minggo d381a16142 change namespace from cocos2d to cc (#2572) 2020-06-16 14:34:46 +08:00
leda dada2eb244 move "cocos2d::experimental::" to "cocos2d::" on Audio (#1549)
* remove “experimental” in audio dir

* update audio bindings

* fix "{" match error

* no need "experimental" for thread pool

* remove both out-of-date js api files
2018-10-18 13:34:12 +08:00
Jare Guo d9bd3d763c update license (#1089)
* updating license

* update license
2018-02-01 15:20:01 +08:00
James Chen fc98b4bdc0 Sync with cocos2d-x v3 branch ddb4dc8 commit. 2017-04-24 10:49:02 +08:00
James Chen b9f5f877d2 [mac, ios] Sync bug fix from https://github.com/cocos2d/cocos2d-x/pull/17011 2016-12-20 15:10:42 +08:00
James Chen f33abbaa74 Updates license years and deletes tailing white spaces. 2016-12-02 10:22:49 +08:00
James Chen 51a5cda2b7 Sync Pull Request https://github.com/cocos2d/cocos2d-x/pull/16946 2016-12-02 10:06:22 +08:00