5 Commits

Author	SHA1	Message	Date
CocosRobot	d07794052f	Update license to 2017 (#17362) ... * Typo: CopyRight -> Copyright * Copyright update: chukong-inc.com -> Chukong Technologies Inc. * [js files] Copyright update: 2014 -> 2014-2017 * [cpp files] Copyright update: 2014 -> 2014-2017 * Copyright update: 2015 -> 2015-2017 * [js files] Copyright update: 2014 -> 2014-2017 * Copyright update: 2016 -> 2016-2017 * Copyright update: 2013 -> 2013-2017 * Copyright update: 201?-201? -> 201?-2017 * License year fixes. * Liscene year fix in CCRay.cpp * Updates license years in CCGLProgramState.h & CCGLProgramStateCache.h	2017-02-14 14:36:57 +08:00
minggo	b4ee6e8971	don't set wrong string for atlas label	2016-03-30 14:32:11 +08:00
zilongshanren	7993ad93d2	fix jsb API inconsistency. ... Ticket id: https://github.com/cocos2d/cocos2d-x/issues/15275	2016-03-18 16:18:40 +08:00
jianglong0156	8a8515e998	fix the menu label size error	2015-08-11 11:21:19 +08:00
WenhaiLin	e50b14b7fb	Add js-tests	2015-04-16 18:07:35 +08:00