Skip to content

Commit 18e1dde

Browse files
committed
Merge pull request #1136 from dingpinglv/Iss2803_V2.1.6Release
Issue #2803: correct some mistakes in AUTHORS.txt
2 parents 4c3ee19 + 2b28db7 commit 18e1dde

File tree

2 files changed

+9
-7
lines changed

2 files changed

+9
-7
lines changed

AUTHORS.txt

+7-7
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ Chris @hannon235 added node.js api for box2d
2525

2626
Jason Aeschliman @jaeschliman fixed cc.Node setposition
2727

28-
Sun Zhuoshi(Intel) @sunzhuoshi engine loader fixed
28+
Zhuoshi Sun(Intel) @sunzhuoshi engine loader fixed
2929

3030
Alejandro Reyero @KaTXi fixed error message
3131

@@ -58,7 +58,7 @@ keisuke hata(Square) @Seasons7 Code review, bug fix
5858

5959
Marat Yakupov @moadib Various bug fixes
6060

61-
Wu Liang @akira-cn Touch location fix for designResolution
61+
Liang Wu @akira-cn Touch location fix for designResolution
6262

6363
Jimmy Sambuo @jsambuo AudioEngine improvements
6464

@@ -74,25 +74,25 @@ Szymon Piłkowski @ardcore CCTexture Bug fix
7474

7575
Tomasz Tunik @tomasztunik CCNode Memory leak fix
7676

77-
Lin Xuankang(Intel) @AndriyLin cc.WebAudioEngine implements
77+
Xuankang Lin(Intel) @AndriyLin cc.WebAudioEngine implements
7878

7979
Kang-Hao Lu(Opera/Oupeng) @kennyluck Optimize John Resig's inheritance pattern
8080
cc.clone improvements
8181

8282
Mark Henderson @MarkEHenderson Code review, LabelTTF and Scale9Sprite bug fix
8383

84-
Wang Jing @06wj CCScheduler improvements
84+
Jing Wang @06wj CCScheduler improvements
8585
Js file loading image add
8686
cc.RectApplyAffineTransform improvements
8787

88-
Wang Ze @WanderWang Fix crash when BrowserTypes match nothing from navigator.userAgent
88+
Ze Wang @WanderWang Fix crash when BrowserTypes match nothing from navigator.userAgent
8989

9090
Christian Schwartz @cschwartz SpriteFrame.initWithTextureFilename converted fix
9191

92-
Zhen XiaoJun @SmallAiTT _getResType error fix
92+
XiaoJun Zheng @SmallAiTT _getResType error fix
9393
cc.ScrollView bug fix
9494

95-
Cheng Guozhu @bengol cc.SimpleAudioEngine bug fix
95+
Guozhu Cheng @bengol cc.SimpleAudioEngine bug fix
9696

9797
Cocos2d-x and cocos2d-html5 can not grow so fast without the active community.
9898

tools/jsdoc_toolkit/build.xml

+2
Original file line numberDiff line numberDiff line change
@@ -38,6 +38,8 @@
3838
<source file="${src.dir}/support/CCPointExtension.js"/>
3939
<source file="${src.dir}/support/CCPNGReader.js"/>
4040
<source file="${src.dir}/support/CCTIFFReader.js"/>
41+
<source file="${src.dir}/support/component/CCComponent.js"/>
42+
<source file="${src.dir}/support/component/CCComponentContainer.js"/>
4143
<source file="${src.dir}/base_nodes/CCNode.js"/>
4244
<source file="${src.dir}/base_nodes/CCdomNode.js"/>
4345
<source file="${src.dir}/base_nodes/CCAtlasNode.js"/>

0 commit comments

Comments
 (0)