minggo eada29ee40 issue #2404:created CCDprecated.h and move all global functions and variables into it		2013-07-15 16:14:26 +08:00
..
Cpp	issue #2404:created CCDprecated.h and move all global functions and variables into it	2013-07-15 16:14:26 +08:00
Javascript	closed #2393: fix conflicts	2013-07-12 18:04:32 +08:00
Lua	closed #2393: fix conflicts	2013-07-12 18:04:32 +08:00
samples.xcodeproj	Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into socketio	2013-07-13 19:24:41 +08:00