Feature #4236: Refactor is/setFlipX/Y to is/setFlippedX/Y in gui classes
add sln file
GL Program API fixes
fixes more warnings
Merge pull request #5548 from ricardoquesada/glprogram_api_fixes

Glprogram api fixes
Updates CHANGELOG with GLProgram changes
Merge pull request #5549 from ricardoquesada/changelog_updates

Updates CHANGELOG with GLProgram changes
Updates to latest version of kazmath
Compiles on Android
Compiles on Linux
updates templates for Linux
kazmath updates for templates
fix:TimerScriptHandler can’t do anything in the `cancel` function
Merge branch 'develop' of git://github.com/cocos2d/cocos2d-x into bug_fix
Adds CC_DLL to kazmath for windows compatibility
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.
Solve the bug: debug frames are not shown in ChipmunkTest.