James Chen 212d445b40 Merge branch 'master' of https://github.com/cocos2d/cocos2d-x into iss1733-hybrid		2013-02-20 14:32:20 +08:00
..
android	Updating Android Template.	2013-01-29 15:03:36 +08:00
blackberry	issue #1683: Updating CCFileUtils for Blackberry and Marmalade.	2013-01-28 20:12:48 +08:00
msvc	fixed a bug of respond touch events in hello.lua. The event type is string now.	2013-02-20 12:03:21 +08:00
multi-platform-cpp	issue #1733: Updated template projects. Using the same package name on iOS as which on Android.	2013-02-20 14:30:05 +08:00
multi-platform-js	issue #1733: Updated template projects. Using the same package name on iOS as which on Android.	2013-02-20 14:30:05 +08:00
multi-platform-lua	issue #1733: Renamed testlua to hellolua.	2013-02-20 13:54:07 +08:00
xcode4	fixed a bug of respond touch events in hello.lua. The event type is string now.	2013-02-20 12:03:21 +08:00