johnangel ad7dacc281 Merge remote branch 'upstream/gles20' into gles20		2012-10-08 16:35:43 +02:00
..
CCBReader	fix a compile error	2012-09-24 15:26:18 +08:00
GUI	fixed #1495: CCScrollView display area and touch area are wrong if its parent's postion isn't at CCPointZero in world.	2012-10-08 14:12:34 +08:00
network	Merge pull request #1361 from ncrothe/gles20	2012-10-08 01:06:39 -07: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	Merge remote branch 'upstream/gles20' into gles20	2012-10-08 16:35:43 +02: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