James Chen 9c26e38563 Merge branch 'gles20' of https://github.com/tongpengfei/cocos2d-x into linux_gles20		2012-08-03 10:10:33 +08:00
..
android	issue #1284: fixed the problem that if the same effect is played for two	2012-08-02 14:28:40 +08:00
include	issue #1399: Renamed 'cocosDeshion' to 'CocosDeshion'.	2012-07-23 10:56:45 +08:00
ios	issue #1399: Renamed 'cocosDeshion' to 'CocosDeshion'.	2012-07-23 10:56:45 +08:00
linux	[FIX] testjs	2012-08-02 16:23:31 +08:00
mac	Adding Mac support!	2012-07-20 21:23:40 -07:00
proj.linux	[FIX] testjs	2012-08-02 16:23:31 +08:00
proj.win32	issue #1399: Added vs2010 support.	2012-07-23 11:57:34 +08:00
third_party/fmod	[LOG] add linux port	2012-08-02 13:02:59 +08:00
win32	issue #1399: Renamed 'cocosDeshion' to 'CocosDeshion'.	2012-07-23 10:56:45 +08:00