6 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
andyque	a15dd55baa	closed #3861, fixed some typo and indent problem	2014-05-06 12:04:52 +08:00
andyque	34b3114e55	issue #3861. add license to CCEventFocus and CCEventListenerFocus	2014-05-05 17:49:31 +08:00
andyque	47acbc24e0	issue #4861, add CCEventFocus and CCEventListener	2014-05-05 11:37:38 +08:00