Merge branch 'task/JAL-3254_improved_max_memory_stack_setting' into task/JAL-3247_JAL...
authorBen Soares <bsoares@dundee.ac.uk>
Mon, 20 May 2019 22:03:23 +0000 (23:03 +0100)
committerBen Soares <bsoares@dundee.ac.uk>
Mon, 20 May 2019 22:03:23 +0000 (23:03 +0100)
Merging a number of fixes/improvements into one branch and then merge in develop

1  2 
gradle.properties

diff --combined gradle.properties
@@@ -59,7 -59,7 +59,7 @@@ getdown_txt_title = Jalvie
  getdown_channel_base = http://www.jalview.org/getdown/jalview
  getdown_channel_name = TEST
  getdown_txt_allow_offline = true
- getdown_txt_jvmmempc = 95
+ getdown_txt_jalview.jvmmempc = 90
  getdown_txt_multi_jvmarg = -Dgetdownappdir="%APPDIR%"
  getdown_txt_strict_comments = true
  getdown_txt_title = Jalview
@@@ -101,6 -101,7 +101,6 @@@ install4jTemplate = install4j_template.
  install4jInfoPlistFileAssociations = file_associations_auto-Info_plist.xml
  install4jInstallerFileAssociations = file_associations_auto-install4j.xml
  install4jBuildDir = build/install4j
 -install4jMediaTypes = windows,macosArchive,linuxRPM,linuxDeb,unixArchive
  install4jMediaTypes = windows,macosArchive,linuxRPM,linuxDeb,unixArchive,unixInstaller
  install4jFaster = false