repair bug: changedisplay(armature,i>=0) does not reblind parentbone
Merge pull request #1 from 2youyouo2/develop

merge kaile
Merge pull request #3 from geron-cn/develop

repair bug: changedisplay(armature,i>=0) does not reblind parentbone
Remove the old implementation of LabelTTF
add boolean support for mac and ios
add Bool Integer Float Double support to CCDictionary
add test for ios and mac
add bool support for other platform
Merge pull request #1 from cocos2d/develop

Merge cocos2d:develop
ignore [] in command [console run].
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
for test close project in cocos-console-test.py.
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into develop
Merge pull request #2 from pandamicro/develop

Merge cocos2d:develop
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into cocos-console-test
closed #4499: Read ParticleSystem::_endRadiusVar from "minRadiusVariance" in plist.
[jenkins-watchdog]add the time of single job
Merge branch 'develop' of https://github.com/cocos2d/cocos2d-x into develop
[jenkins-watchdog]add the time of single job