samuele3hu 71fe43ee97 Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop		2013-06-20 22:40:21 +08:00
..
Cpp	Fix compile error.	2013-06-20 19:20:27 +09:00
Javascript	issue #2129: Removing CC prefix for samples module.	2013-06-20 14:17:10 +08:00
Lua	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into scrollview_develop	2013-06-20 22:40:21 +08:00