Skip to content

Commit

Permalink
Merge pull request cocos2d#14430 from cocos2d/V3.9
Browse files Browse the repository at this point in the history
V3.9
  • Loading branch information
pandamicro committed Nov 19, 2015
2 parents b8ebd51 + d0c3275 commit fbcf068
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
cocos2d-x-3.9 beta0 October.20 2015
cocos2d-x-3.9 November.09 2015

[NEW] Label: Added line spacing/leading feature to Label.
[NEW] ListView: Added APIs to scroll to specific item in list.
Expand Down
2 changes: 1 addition & 1 deletion cocos/cocos2d.h
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ THE SOFTWARE.

// 0x00 HI ME LO
// 00 03 08 00
#define COCOS2D_VERSION 0x00030800
#define COCOS2D_VERSION 0x00030900

//
// all cocos2d include files
Expand Down

0 comments on commit fbcf068

Please sign in to comment.