4 Commits

Author	SHA1	Message	Date
pandamicro	34b93a24ff	Merge branch 'v3' of git://github.com/cocos2d/cocos2d-x into 3.2-cocos-engine-PR ... Conflicts: cocos/platform/desktop/CCGLViewImpl.h	2014-08-21 16:07:19 +08:00
pandamicro	909dd0d397	Update #3897: Refactor missed protected constructors	2014-08-21 15:11:33 +08:00
Huabing.Xu	63de5f6acc	add CC_DLL	2014-07-15 12:00:31 +08:00
Ricardo Quesada	8bb8416c26	Improved directory structure	2014-04-29 17:37:36 -07:00