branch master-2.x updated (b69818b -> 6959b34)
This is an automated email from the git hooks/post-receive script. New change to branch master-2.x in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git from b69818b [jgitflow-maven-plugin]merging 'release/2.40' into 'master-2.x' adds 56227a4 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds accbb39 [jgitflow-maven-plugin]merging 'master-2.x' into 'develop-2.x' adds 68b7c2a [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 7c62d1f fixes #4141 [JAXX-Demo] jaxx.cssExtension property is missing adds 1d1e99f Add a force option in BeanComboBox to set selectedItem value (Fixes #4157) adds 5d845a5 fix scm url to be able to make release over ssh adds 2a927f5 fix scm url to be able to make release over ssh adds f4f052a [jgitflow-maven-plugin]updating poms for branch'release/2.41' with non-snapshot versions adds b0a048a do not send email (I dont have this configuration) adds b99ba3e fix jaxx-demo version adds 6959b34 [jgitflow-maven-plugin]merging 'release/2.41' into 'master-2.x' No new revisions were added by this update. Summary of changes: jaxx-application-api/pom.xml | 2 +- jaxx-application-swing/pom.xml | 2 +- jaxx-compiler/pom.xml | 2 +- jaxx-config/pom.xml | 2 +- jaxx-demo/pom.xml | 3 +- jaxx-maven-plugin/pom.xml | 2 +- jaxx-runtime/pom.xml | 2 +- jaxx-validator/pom.xml | 2 +- jaxx-widgets-about/pom.xml | 2 +- jaxx-widgets-common/pom.xml | 2 +- jaxx-widgets-datetime/pom.xml | 2 +- jaxx-widgets-extra/pom.xml | 2 +- jaxx-widgets-gis/pom.xml | 2 +- jaxx-widgets-number/pom.xml | 2 +- jaxx-widgets-select/pom.xml | 2 +- jaxx-widgets/pom.xml | 2 +- .../runtime/swing/editor/bean/BeanComboBox.jaxx | 2 + .../swing/editor/bean/BeanComboBoxHandler.java | 45 +++++++++++----------- pom.xml | 5 ++- 19 files changed, 45 insertions(+), 40 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm