add TestCase for reparentChildren bug
Merge branch 'v3' into reparentChildren
set parent transform dirty when addChild
Undo project file changes
Merge branch 'reparentChildren' of https://github.com/darkdukey/cocos2d-x into v3_nodefix
update project
Adds ValueVectorNull, ValueMapNull, ValueMapIntKeyNull global variables.
closed #5160: Dispatch a custom event after an animation frame is displayed
closed #5160: Updates ActionTest
issue #5160: Don't use static variables, use member variables
issue #5160: Updates actiontest
Merge pull request #6715 from dumganhar/iss5160-animation-notification

closed #5160: Dispatch a custom event after an animation frame is displayed
[ci skip]
fix compiling fail on Linux.
Updates travis.yml, adds email notification to @Minggo and @James
Merge pull request #6718 from dumganhar/v3

Updates travis.yml, adds email notification to @Minggo and @James
Matrix::identity() -> IDENTITY

consistency with the rest of the  cocos2d API
Merge pull request #6720 from ricardoquesada/matrix_constants

Matrix::identity() -> IDENTITY
Adds simple sample for multitexturing
Merge pull request #6722 from ricardoquesada/multitexturing_fixes

Adds simple sample for multitexturing