James Chen 3eecc283d0 Merge branch 'iss1437_return_pointer' of https://github.com/minggo/cocos2d-x into iss1437_return_pointer		2012-08-21 16:57:41 +08:00
..
CCBReader	Merge pull request #1208 from minggo/iss1382_ccb_reader	2012-08-20 20:23:03 -07:00
GUI	Merge branch 'iss1437_return_pointer' of https://github.com/minggo/cocos2d-x into iss1437_return_pointer	2012-08-21 16:57:41 +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 #1424, http wrapper has been tested on iOS, mac, android port.	2012-08-09 10:45:11 +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