Huabing.Xu 041bef148a Merge branch 'origin/develop' ... Conflicts: cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj cocos2dx/proj.win32/cocos2d.vcxproj.filters		2013-07-02 13:47:02 +08:00
..
cocos2dx.xcodeproj	Merge branch 'origin/develop'	2013-07-02 13:47:02 +08:00
cocos2dx-Prefix.pch	issue #1269:make tests HelloWorld HelloLua and testjs refer subproject cocos2dx	2012-06-19 13:50:11 +08:00