6 Commits

Author	SHA1	Message	Date
James Chen	426915dd4a	fixed some compilation error for win32 platform.	2012-09-24 11:05:15 +08:00
James Chen	8e290cad6e	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1454_javascript	2012-08-31 23:29:02 +08:00
James Chen	94a1aa6123	issue #1454: fixed bugs in test-particles.js.	2012-08-31 23:28:43 +08:00
minggo	dacf1704fc	issue #1454:use pvr instead of pvr.gz and fix a bug of build_native.sh	2012-08-31 23:16:36 +08:00
James Chen	9ba5a1bfef	issue #1454: Removed COCOS2D_JAVASCRIPT macro.	2012-08-31 21:23:23 +08:00
James Chen	dd8c993581	issue #1454: Removed some duplicated resources files.	2012-08-31 19:50:20 +08:00