From: Ben Soares <b.soares@dundee.ac.uk>
Date: Sat, 29 Jan 2022 00:57:07 +0000 (+0000)
Subject: Merge branch 'develop' into improvement/JAL-3830_install4j9_macos_setup_application
X-Git-Tag: Release_2_11_2_1~66
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=36f083dc674297be2157d9f291a7cddba9d3250a;hp=--cc;p=jalview.git

Merge branch 'develop' into improvement/JAL-3830_install4j9_macos_setup_application
---

36f083dc674297be2157d9f291a7cddba9d3250a
diff --cc gradle.properties
index 95b1299,21360df..b1244b0
--- a/gradle.properties
+++ b/gradle.properties
@@@ -112,8 -112,9 +112,9 @@@ j11modules = com.sun.istack.runtime,com
  flexmark_css = utils/doc/github.css
  
  channel_properties_dir = utils/channels
+ channel_props = channel.props
  
 -install4j_home_dir = ~/buildtools/install4j8
 +install4j_home_dir = ~/buildtools/install4j9
  install4j_copyright_message = ...
  install4j_bundle_id = org.jalview.jalview-desktop
  install4j_utils_dir = utils/install4j