You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@royale.apache.org by gr...@apache.org on 2020/03/25 10:45:39 UTC

[royale-asjs] 02/06: Merge branch 'develop' of https://github.com/apache/royale-asjs into develop

This is an automated email from the ASF dual-hosted git repository.

gregdove pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/royale-asjs.git

commit 540ef1e7d57fa55f04c3f03541fb237ef337b104
Merge: c08c41d 7499534
Author: greg-dove <gr...@gmail.com>
AuthorDate: Wed Mar 25 06:24:49 2020 +1300

    Merge branch 'develop' of https://github.com/apache/royale-asjs into develop

 build.properties                                   |   2 +-
 examples/build.xml                                 |   4 +-
 .../src/main/royale/AdvancedListPlayGround.mxml    |   2 +-
 .../src/main/royale/ButtonPlayGround.mxml          |   8 +-
 .../src/main/royale/ComboBoxPlayGround.mxml        |  16 ++--
 .../src/main/royale/DataGridPlayGround.mxml        |   2 +-
 .../src/main/royale/DropDownListPlayGround.mxml    |  18 ++--
 .../src/main/royale/GridPlayGround.mxml            |   4 +-
 .../src/main/royale/LayoutsPlayGround.mxml         |   8 +-
 .../src/main/royale/ListPlayGround.mxml            |   4 +-
 .../src/main/royale/NumericStepperPlayGround.mxml  |   8 +-
 .../src/main/royale/TablePlayGround.mxml           |   4 +-
 .../src/main/royale/WelcomeSection.mxml            |   2 +-
 .../src/main/royale/WizardPlayGround.mxml          |   2 +-
 .../ExampleAndSourceCodeTabbedSectionContent.as    |   2 +-
 .../src/main/royale/components/FormExample.mxml    |   2 +-
 .../itemRenderers/SimpleIconListItemRenderer.mxml  |   2 +-
 .../TabBarHorizontalIconItemRenderer.mxml          |   2 +-
 .../TabBarVerticalIconItemRenderer.mxml            |   2 +-
 .../Basic/src/main/resources/basic-manifest.xml    |   1 +
 .../projects/Basic/src/main/royale/BasicClasses.as |   3 +-
 .../org/apache/royale/html/beads/SetFocus.as       |  97 +++++++++++++++++++
 .../projects/Jewel/src/main/resources/defaults.css |   3 +
 .../royale/org/apache/royale/jewel/Container.as    |   5 +-
 .../main/royale/org/apache/royale/jewel/Group.as   |   5 +-
 .../royale/jewel/beads/layouts/StyledLayoutBase.as |   5 +-
 .../royale/jewel/beads/views/FormItemView.as       |   4 +-
 .../apache/royale/jewel/beads/views/WizardView.as  |   4 +-
 pom.xml                                            |  45 +++++----
 releasesteps.xml                                   | 106 ++++++++++-----------
 30 files changed, 242 insertions(+), 130 deletions(-)