Feature #4236: Refactor is/setFlipX/Y to is/setFlippedX/Y in gui classes
add sln file
fix:TimerScriptHandler can’t do anything in the `cancel` function
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug_fix
Merge pull request #5551 from samuele3hu/bug_fix

fix:make TimerScriptHandler do nothing in the `cancel` function
Merge pull request #5545 from lihex/develop

add sln file
Adds EventListenerTouchOneByOne::isSwallowTouches, fixes a typo for Director::EVENT_AFTER_UPDATE.
Merge pull request #5552 from dumganhar/develop

Adds EventListenerTouchOneByOne::isSwallowTouches, fixes a typo for Director::EVENT_AFTER_UPDATE.
Merge pull request #5542 from pandamicro/myfix

Feature #4236: Refactor is/setFlipX/Y to is/setFlippedX/Y in gui classes