Skip to content

Commit 25a8222

Browse files
committed
Merge pull request cocos2d#1776 from dingpinglv/Iss4757_ReleaseAlpha2
Issue #4757: update the CHANGELOG.txt and README.mdown
2 parents c3a7ea5 + f086406 commit 25a8222

File tree

2 files changed

+2
-1
lines changed

2 files changed

+2
-1
lines changed

CHANGELOG.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ Cocos2d-html5-v3.0 alpha2 @ April.14, 2014
1212
* cc.Node's pauseSchedulerAndActions and resumeSchedulerAndActions are deprecated, please use pause and resume instead.
1313
* Add render mode checking to 3D action classes.
1414
* Use undefined check in cc.loader for better performance.
15-
* Sync cc.eventManager to the latest version of Cocos2d-x v3.0 Stable.
15+
* Sync cc.eventManager to the latest version of Cocos2d-x v3.0 final.
1616
* ccui.Layout's doLayout function has been set to private function "_doLayout".
1717
* Rename all Uppercase functions to lowercase in CCMacro.js.
1818
* Add more necessary GL constants in engine.

README.mdown

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@ Cross Platform
1414
Documentation
1515
------------------
1616
* Website: [www.cocos2d-x.org][3]
17+
* API References: [http://www.cocos2d-x.org/wiki/Reference] [4]
1718

1819
Running the tests
1920
------------------

0 commit comments

Comments
 (0)