Merge branch 'develop' of https://git-wip-us.apache.org/repos/asf/flex-asjs 
into develop


Project: http://git-wip-us.apache.org/repos/asf/flex-asjs/repo
Commit: http://git-wip-us.apache.org/repos/asf/flex-asjs/commit/2dd4d5d2
Tree: http://git-wip-us.apache.org/repos/asf/flex-asjs/tree/2dd4d5d2
Diff: http://git-wip-us.apache.org/repos/asf/flex-asjs/diff/2dd4d5d2

Branch: refs/heads/develop
Commit: 2dd4d5d2eba56a1445fde2ee2f85cdf244b1f6c8
Parents: c5b71c4 4010a04
Author: Justin Mclean <[email protected]>
Authored: Thu Jul 13 14:23:04 2017 +1000
Committer: Justin Mclean <[email protected]>
Committed: Thu Jul 13 14:23:04 2017 +1000

----------------------------------------------------------------------
 .../org/apache/flex/core/ApplicationBase.as     |   1 +
 .../org/apache/flex/html/beads/DisableBead.as   |   6 +-
 .../apache/flex/html/beads/DisabledAlphaBead.as | 130 +++++++++++++++++++
 .../html/beads/layouts/HorizontalFlexLayout.as  |   2 +-
 .../html/beads/layouts/VerticalFlexLayout.as    |   2 +-
 .../supportClasses/AccordionItemRenderer.as     |   1 -
 .../Basic/src/main/resources/basic-manifest.xml |   1 +
 .../Basic/src/main/resources/defaults.css       |   1 +
 .../flex/org/apache/flex/utils/BinaryData.as    |   9 ++
 .../html/beads/SingleSelectionDragSourceBead.as |   4 +
 .../beads/controllers/DragMouseController.as    |  13 +-
 .../main/flex/org/apache/flex/file/FileProxy.as |   9 ++
 .../org/apache/flex/file/beads/FileBrowser.as   |  26 ++--
 .../flex/file/beads/FileBrowserWithFilter.as    |  63 +++++++++
 .../org/apache/flex/file/beads/FileLoader.as    |   2 +-
 .../org/apache/flex/file/beads/FileModel.as     |   2 +-
 .../src/main/resources/basic-manifest.xml       |   1 +
 17 files changed, 247 insertions(+), 26 deletions(-)
----------------------------------------------------------------------


Reply via email to