James Chen 80cb06d3f7 Merge branch 'minggo-iss2305-replace-pthread' of https://github.com/dumganhar/cocos2d-x into minggo-iss2305-replace-pthread		2013-06-24 10:01:57 +08:00
..
android	merge the conflict copy_files.sh	2013-06-21 07:24:01 +08:00
multi-platform-cpp	Merge branch 'minggo-iss2305-replace-pthread' of https://github.com/dumganhar/cocos2d-x into minggo-iss2305-replace-pthread	2013-06-24 10:01:57 +08:00
multi-platform-js	Merge branch 'minggo-iss2305-replace-pthread' of https://github.com/dumganhar/cocos2d-x into minggo-iss2305-replace-pthread	2013-06-24 10:01:57 +08:00
multi-platform-lua	Merge branch 'minggo-iss2305-replace-pthread' of https://github.com/dumganhar/cocos2d-x into minggo-iss2305-replace-pthread	2013-06-24 10:01:57 +08:00
xcode4	issue #2129: Re-adds 'CC' prefix to objective-c classes for all projects.	2013-06-21 11:14:03 +08:00