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
..
Classes	make TestJavaScript work and fix some warnings	2012-09-24 13:57:45 +08:00
Resources	fixed some compilation error for win32 platform.	2012-09-24 11:05:15 +08:00
proj.android	fixed #1481: merge Nicolas's pull request and do some bug fixes	2012-09-21 17:01:19 +08:00
proj.ios	fix conflict	2012-09-24 15:01:24 +08:00
proj.win32	Added libExtensions.lib for TestJavascript vs2010 project.	2012-09-24 11:47:33 +08:00