Added triangle, quad bezier, cubic bezier drawing to DrawNode
Readded trimmed semicolon
Added triangle, cubic bezier and quad bezier tests to DrawPrimitivesTest
Merge branch 'drawing_primitives' of github.com:ThePickleMan/cocos2d-x into drawing_primitives
Add selected image to slider
Merge branch 'develop' into fix-extensions-slider
fix cc
Add scale ratio to button touchdown
Merge branch 'develop' into fix-button-scale-to
Merge branch 'develop' into fix-extensions-slider
Merge pull request #2 from cocos2d/develop

update
support mingw
Merge pull request #3 from cocos2d/develop

update
testcpp mingw
Merge branch 'develop' of https://github.com/akof1314/cocos2d-x into develop
fix addImageAsync  bad judgment of generate image for the first ImageFile.
Adds a new test that shows the problem with the Camera

Apprently the bug is in  QuadCommand, since if we use CustomCommand
the camera works OK.
Merge pull request #4994 from Dhilan007/develop_crash

fix issue#3611:addImageAsync  bad judgment of generate image for the first ImageFile.
update If Construct
amendment incorrect use of macro