Donald Alan Morrison 5075a83271 Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 ... Conflicts: cocos2dx/kazmath/src/ray2.c		2012-08-25 00:00:27 -07:00
..
CCBReader	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-08-25 00:00:27 -07:00
GUI	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into android_editbox	2012-08-24 00:16:11 +08:00
network	fixed #1424: http wrapper compiled ok on win32.	2012-08-09 17:04:55 +08:00
proj.blackberry	fixed #1420: Merged gles20 branch of blackberry port from Dale's repo and fixed some bugs.	2012-08-20 15:49:02 +08:00
proj.win32	fixed #1424: http wrapper compiled ok on win32.	2012-08-09 17:04:55 +08:00
Android.mk	issue #1429: First commit CCEditBox for android port.	2012-08-22 09:47:04 +08:00
ExtensionMacros.h	issue #1399: Adjust folder structure, made it built successfully on win32.	2012-07-20 14:05:52 +08:00
cocos-ext.h	issue #1429: First commit CCEditBox support, only valid on IOS. PLZ refer to ExtensionsTest/EditBoxTest.	2012-08-15 14:33:56 +08:00