You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flex.apache.org by ha...@apache.org on 2016/08/14 19:54:27 UTC

[5/5] git commit: [flex-asjs] [refs/heads/refactor-sprite] - Merge branch 'develop' into refactor-sprite

Merge branch 'develop' into refactor-sprite

* develop:
  Use Matrix concat
  Remove MeagerMatrix removed Vector3D Reimplemented Matrix using compatible licensed code Added chainability to Matrix methods
  clean better
  fix build

# Conflicts:
#	frameworks/projects/Core/src/main/flex/org/apache/flex/core/IRenderedObject.as
#	frameworks/projects/Core/src/main/flex/org/apache/flex/geom/Matrix.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/c523ace3
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/c523ace3
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/c523ace3

Branch: refs/heads/refactor-sprite
Commit: c523ace327cb3129e90ac03978c163cf2ad0ce76
Parents: 6b2367f ece2ee3
Author: Harbs <ha...@in-tools.com>
Authored: Sun Aug 14 22:54:09 2016 +0300
Committer: Harbs <ha...@in-tools.com>
Committed: Sun Aug 14 22:54:09 2016 +0300

----------------------------------------------------------------------
 asdoc/build.xml                                 |   2 +-
 frameworks/fontsrc/build.xml                    |   1 +
 .../apache/flex/core/TransformCompoundModel.as  |   2 +-
 .../main/flex/org/apache/flex/geom/Matrix.as    | 240 +++++++++++++------
 .../main/flex/org/apache/flex/geom/Vector3D.as  | 208 ----------------
 5 files changed, 169 insertions(+), 284 deletions(-)
----------------------------------------------------------------------