James Chen 93ecfbbf7e Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x into nacl-fix		2013-06-08 15:42:41 +08:00
..
Cpp	Merge branch 'master' of https://github.com/2youyouo2/cocos2d-x into nacl-fix	2013-06-08 15:42:41 +08:00
Javascript	[iOS] Enabling multiple touch event for TestJavascript, multi-platform-js, multiplatform-lua.Disabling multiple touch event for multi-platform-cpp.	2013-06-06 18:07:11 +08:00
Lua	Updating makefile for native client.	2013-06-08 15:35:45 +08:00