walzer caa67d1eed Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into adapt-4inch-iphone5 ... Conflicts: samples/TestJavascript/proj.ios/TestJavascript.xcodeproj/project.pbxproj		2012-09-24 15:17:58 +08:00
..
project.pbxproj	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into adapt-4inch-iphone5	2012-09-24 15:17:58 +08:00