5 Commits

Author	SHA1	Message	Date
James Chen	be362bef9b	issue #1310: Some typo fixes. Updated CCTexture2D.h/.cpp.	2012-06-11 21:58:04 +08:00
James Chen	26cf81e42e	Merge branch 'gles20' of https://github.com/cocos2d/cocos2d-x into gles20 ... Conflicts: cocos2dx/CCScheduler.h cocos2dx/include/ccTypes.h	2012-06-08 14:14:13 +08:00
James Chen	c5cf23c859	issue #1310: First commit since sync to rc2.	2012-06-08 14:11:48 +08:00
minggo	cc16320445	issue #1310: syncronize actions	2012-06-08 13:55:28 +08:00
James Chen	0f36a89c7e	issue #1188: Refactor directory. Compile successfully on android and win32(vs2008 debug).	2012-04-25 16:18:04 +08:00