Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs
into develop
Conflicts:
frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/utils/shaderClasses/ColorBurnShader.as
frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/utils/shaderClasses/ColorDodgeShader.as
frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/utils/shaderClasses/ColorShader.as
frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/utils/shaderClasses/ExclusionShader.as
frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/utils/shaderClasses/HueShader.as
frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/utils/shaderClasses/LuminosityMaskShader.as
frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/utils/shaderClasses/LuminosityShader.as
frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/utils/shaderClasses/SaturationShader.as
frameworks/projects/Graphics/src/main/flex/org/apache/flex/graphics/utils/shaderClasses/SoftLightShader.as
Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/53c6beef
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/53c6beef
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/53c6beef
Branch: refs/heads/develop
Commit: 53c6beef26394f5654f14c60648116274f66dad4
Parents: b8a66fb 281c778
Author: yishayw <yishayj...@hotmail.com>
Authored: Tue Mar 7 12:44:04 2017 +0200
Committer: yishayw <yishayj...@hotmail.com>
Committed: Tue Mar 7 12:44:04 2017 +0200
----------------------------------------------------------------------
frameworks/projects/Graphics/build.xml | 1 +
1 file changed, 1 insertion(+)
----------------------------------------------------------------------
