branch master-2.x updated (635561d -> 10c59e3)
This is an automated email from the git hooks/post-receive script. New change to branch master-2.x in repository jaxx. See http://git.nuiton.org/jaxx.git from 635561d Merge branch 'release/2.25' into master-2.x adds 576bb88 [jgitflow-maven-plugin]updating poms for 2.26-SNAPSHOT development adds 4b25559 [jgitflow-maven-plugin]updating develop poms to master versions to avoid merge conflicts adds 784a808 Merge branch 'master-2.x' into develop-2.x adds 6afa34e [jgitflow-maven-plugin]Updating develop poms back to pre merge state adds 709848a Synchronise and swallow exceptions when opening ActionUI (See #3774) adds 5ccb898 Got some ui error while opening the ActionUI (so swallow any exception while opening ActionUI). Fixes #3774 Merge branch 'feature/3774' into develop-2.x adds b2cfbb8 Having the choice of the wildcard character in the filterable combobox fixes #3776 adds b708946 [jgitflow-maven-plugin]updating poms for branch'release/2.26' with non-snapshot versions adds 10c59e3 Merge branch 'release/2.26' 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 +- .../swing/action/ApplicationActionSwingWorker.java | 21 +++++++++++- jaxx-compiler/pom.xml | 2 +- jaxx-config/pom.xml | 2 +- jaxx-demo/pom.xml | 2 +- jaxx-maven-plugin/pom.xml | 2 +- jaxx-runtime/pom.xml | 2 +- .../swing/model/JaxxFilterableComboBoxModel.java | 40 +++++++++++++++++----- jaxx-validator/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 +- pom.xml | 2 +- 18 files changed, 68 insertions(+), 25 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm