Are you using cherry-picking to do this? Be careful about merging version numbers and snapshots from dev into release.
IMO, it is a dangerous practice to merge develop into a release branch. -Alex On 8/20/19, 11:38 PM, "[email protected]" <[email protected]> wrote: This is an automated email from the ASF dual-hosted git repository. piotrz pushed a commit to branch release/0.9.6 in repository https://nam04.safelinks.protection.outlook.com/?url=https%3A%2F%2Fgitbox.apache.org%2Frepos%2Fasf%2Froyale-asjs.git&data=02%7C01%7Caharui%40adobe.com%7Cbcf5b54d5bb04907c78208d7260227d8%7Cfa7b1b5a7b34438794aed2c178decee1%7C0%7C1%7C637019663005699711&sdata=RFt66D0q7GnARG29qEn%2FTwbtefahoA%2BS4KGuBvTvCCs%3D&reserved=0 commit 6ca209d3bdb11b9964954039c503509bce52e096 Merge: 31b94b6 8171f1e Author: Piotr Zarzycki <[email protected]> AuthorDate: Wed Aug 21 08:38:02 2019 +0200 Merge branch 'develop' into release/0.9.6 build.xml | 172 +-------- .../src/main/royale/hljs.as | 0 .../src/main/royale/ButtonPlayGround.mxml | 2 + .../ExampleAndSourceCodeTabbedSectionContent.as | 5 +- .../royale/TourDeJewel}/src/main/royale/hljs.as | 0 .../src/main/config/compile-js-config.xml | 33 +- .../main/royale/org/apache/royale/core/UIBase.as | 8 +- .../org/apache/royale/html/beads/ComboBoxView.as | 2 +- .../CascadingMenuSelectionMouseController.as | 78 +++- .../controllers/MenuSelectionMouseController.as | 19 +- .../royale/html/beads/layouts/DataGridLayout.as | 19 +- .../royale/html/supportClasses/DataGridColumn.as | 3 +- .../royale/org/apache/royale/core/IEffectTimer.as | 2 +- .../org/apache/royale/core/SimpleCSSValuesImpl.as | 3 +- .../royale/org/apache/royale/utils/EffectTimer.as | 2 +- .../main/royale/org/apache/royale/effects/Wipe.as | 8 + .../Jewel/src/main/resources/jewel-manifest.xml | 3 + .../projects/Jewel/src/main/royale/JewelClasses.as | 2 - .../Jewel/src/main/royale/dialogPolyfill.as | 8 + .../main/royale/org/apache/royale/jewel/Alert.as | 7 +- .../main/royale/org/apache/royale/jewel/Button.as | 418 +++------------------ .../beads/controls/drawer/HideDrawerOnMouseDown.as | 90 +++++ .../jewel/beads/validators/CheckBoxValidator.as | 30 +- .../button/BasicButton.as} | 193 +++------- .../src/main/config/compile-swf-config.xml | 32 ++ .../src/main/resources/assets/divider_vertical.png | Bin 0 -> 27186 bytes .../main/resources/assets/icon_align_center.png | Bin 0 -> 27220 bytes .../main/resources/assets/icon_align_justify.png | Bin 0 -> 27095 bytes .../src/main/resources/assets/icon_align_left.png | Bin 0 -> 27210 bytes .../src/main/resources/assets/icon_align_right.png | Bin 0 -> 27210 bytes .../src/main/resources/assets/icon_bullet.png | Bin 0 -> 27234 bytes .../src/main/resources/assets/icon_style_bold.png | Bin 0 -> 27205 bytes .../main/resources/assets/icon_style_italic.png | Bin 0 -> 27229 bytes .../main/resources/assets/icon_style_underline.png | Bin 0 -> 27197 bytes .../MXRoyale/src/main/resources/defaults.css | 7 +- .../MXRoyale/src/main/royale/MXRoyaleClasses.as | 3 + .../main/royale/mx/containers/beads/BoxLayout.as | 12 +- .../main/royale/mx/containers/beads/PanelView.as | 3 + .../src/main/royale/mx/controls/RadioButton.as | 60 ++- .../main/royale/mx/controls/RichTextEditor.mxml | 16 +- .../src/main/royale/mx/controls/ToggleButtonBar.as | 26 +- .../main/royale/mx/controls/beads/ComboBoxView.as} | 52 ++- .../controls/beads/DataProviderChangeNotifier.as | 102 +++++ .../controllers/RadioButtonMouseController.as | 4 +- .../mx/controls/beads/layouts/DataGridLayout.as | 114 ++++++ .../mx/controls/listClasses/AdvancedListBase.as | 30 ++ .../MXRoyale/src/main/royale/mx/core/Container.as | 20 +- .../src/main/royale/mx/core/IUIComponent.as | 4 +- .../src/main/royale/mx/core/UIComponent.as | 85 +++-- .../src/main/royale/mx/managers/ISystemManager.as | 4 +- .../src/main/royale/mx/managers/PopUpManager.as | 7 +- .../src/main/royale/mx/managers/SystemManager.as | 28 +- .../royale/spark/components/SkinnableContainer.as | 3 - .../spark/components/supportClasses/GroupBase.as | 3 - marmotinni/java/downloads.xml | 23 +- .../java/marmotinni/DispatchMouseClickEvent.java | 6 +- .../src/main/java/marmotinni/MarmotinniRunner.java | 24 +- mustella/tests/mxtests/basicTests/RoyaleContext.as | 2 +- .../halo/scripts/NumericStepperTestScript.mxml | 7 +- 59 files changed, 938 insertions(+), 846 deletions(-)
