Donald Alan Morrison f6b51c0a5f Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20		2012-09-25 10:20:18 -07:00
..
CCBReader	fix a compile error	2012-09-24 15:26:18 +08:00
GUI	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20	2012-09-25 10:20:18 -07:00
network	Delete 'cocos2d::' since extension is the sub-namespace of cocos2d.	2012-09-24 11:08:10 +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	issue #1483: Synchronizing CCControlExtension to latest version.	2012-09-25 16:57:51 +08:00
Android.mk	issue #1483: Synchronizing CCControlExtension to latest version.	2012-09-25 16:57:51 +08:00
ExtensionMacros.h	issue #1483: Added LICENSE_CCControlExtension.txt, and added license information for headers of CCControlExtension.	2012-09-25 17:26:09 +08:00
cocos-ext.h	fixed #1470: Made CCBReader support cocosbuilder v2.1-beta0.	2012-09-19 18:41:50 +08:00