Merge branch 'develop' into task/JAL-3337_gradle_tasks_sourceDist_and_help2Website
authorBen Soares <bsoares@dundee.ac.uk>
Tue, 2 Jul 2019 12:34:30 +0000 (13:34 +0100)
committerBen Soares <bsoares@dundee.ac.uk>
Tue, 2 Jul 2019 12:34:30 +0000 (13:34 +0100)
Merging in develop

1  2 
gradle.properties

diff --combined gradle.properties
@@@ -21,12 -21,10 +21,12 @@@ j11libDir = j11li
  resourceDir = resources
  helpParentDir = help
  helpDir = help
 +helpOutputDir = build/distribution/help
  docDir = doc
  sourceDir = src
  schemaDir = schemas
  classesDir = classes
 +examplesDir = examples
  clover = false
  use_clover = false
  cloverClassesDir = clover-classes
@@@ -59,6 -57,7 +59,7 @@@ getdown_launch_jvl = channel_launch.jv
  getdown_build_properties = build_properties
  getdown_txt_title = Jalview
  getdown_txt_allow_offline = true
+ getdown_txt_max_concurrent_downloads = 10
  getdown_txt_jalview.jvmmempc = 90
  getdown_txt_multi_jvmarg = -Dgetdownappdir=%APPDIR%
  getdown_txt_strict_comments = true