James Chen 533cb8dc48 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into iss1517-ff16		2012-10-19 13:57:34 +08:00
..
HelloCpp	fixed #1515: implement zoom function on mac os	2012-10-19 11:33:06 +08:00
HelloLua	Merge remote branch 'upstream/gles20' into gles20	2012-10-16 08:42:30 +02:00
MoonWarriors	issue #1517: Added ws2_32.lib for MoonWarriors.vcxproj and TestJavascript.vcxproj.	2012-10-19 11:21:27 +08:00
SimpleGame	Updated AppDelegate of SampleGame for iOS port.	2012-10-15 18:50:46 +08:00
TestCpp	Merge pull request #1471 from minggo/iss1466-shader-test	2012-10-17 20:03:22 -07:00
TestJavascript	issue #1517: Added ws2_32.lib for MoonWarriors.vcxproj and TestJavascript.vcxproj.	2012-10-19 11:21:27 +08:00
TestLua	Merge remote branch 'upstream/gles20' into gles20	2012-10-08 16:35:43 +02:00