samuele3hu f5f95399fd Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into developConversion		2013-12-18 14:58:35 +08:00
..
bindings	Add support for unsigned short	2013-12-18 13:47:59 +08:00
script	issue #3402:Add the new label lua binding and the releated test cases	2013-12-18 11:39:43 +08:00