This is an automated email from the ASF dual-hosted git repository.
desruisseaux pushed a commit to branch main
in repository https://gitbox.apache.org/repos/asf/sis.git
commit 6008e5e18d484c93b2ee7b32a79aa23a4fca3719
Merge: d4fc457a24 a2820288ee
Author: Martin Desruisseaux <martin.desruisse...@geomatys.com>
AuthorDate: Fri Oct 6 20:49:00 2023 +0200
Merge branch 'geoapi-4.0' into geoapi-3.1
.../apache/sis/buildtools/gradle/Assembler.java | 74 ++++++++++++++++------
.../org.apache.sis.storage/main/module-info.java | 1 +
optional/src/org.apache.sis.gui/bundle/bin/sis | 3 +-
optional/src/org.apache.sis.gui/bundle/bin/sis.bat | 3 +-
optional/src/org.apache.sis.gui/bundle/bin/sisfx | 2 +-
.../src/org.apache.sis.gui/bundle/bin/sisfx.bat | 2 +-
optional/src/org.apache.sis.gui/bundle/lib/README | 10 ++-
.../src/org.apache.sis.gui/bundle/lib/app/README | 2 +
8 files changed, 70 insertions(+), 27 deletions(-)
