Huabing.Xu 041bef148a Merge branch 'origin/develop' ... Conflicts: cocos2dx/proj.ios/cocos2dx.xcodeproj/project.pbxproj cocos2dx/proj.win32/cocos2d.vcxproj.filters		2013-07-02 13:47:02 +08:00
..
cocos2d.vcxproj	Merge branch 'origin/develop'	2013-07-02 13:47:02 +08:00
cocos2d.vcxproj.filters	Merge branch 'origin/develop'	2013-07-02 13:47:02 +08:00
cocos2d.vcxproj.filters.orig	issue #2284: fix bugs after merging master	2013-06-14 14:34:50 +08:00
cocos2d.vcxproj.user	issue #1399: Added vs2010 support.	2012-07-23 11:57:34 +08:00
cocos2dx.props	issue #2305: [Win32] Removing the third party library pthreadVCE2.	2013-06-26 12:52:38 +08:00