From: gmungoc Date: Thu, 4 Jul 2019 12:09:21 +0000 (+0100) Subject: Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop X-Git-Tag: Release_2_11_0~1^2~4 X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=04891000c8b07e61b59f3b5ced0e42835dec73ce;hp=dd193c9ceff22f721c53814fd9c37f269a9edfde Merge branch 'develop' of https://source.jalview.org/git/jalview.git into develop --- diff --git a/doc/building.md b/doc/building.md index cc3d7f2..5f5fa6d 100644 --- a/doc/building.md +++ b/doc/building.md @@ -24,7 +24,7 @@ java -jar getdown-launcher.jar . jalview The method here is described in terms of using a command line. You can easily do this on linux or in a Terminal window in macOS. You can do it in Windows. * Java 11 compliant JDK -* gradle 5.1 or above +* gradle 5.2 or above * git > The versions and installation methods here are just suggestions (which we have tested diff --git a/help/help/html/features/jvlfiles.html b/help/help/html/features/jvlfiles.html index 15df5d4..8661860 100644 --- a/help/help/html/features/jvlfiles.html +++ b/help/help/html/features/jvlfiles.html @@ -39,7 +39,7 @@ text editor and save them as a file with the extension '.jvl'. To test, open your saved .jvl file via the OSX File Chooser or Windows file explorer, or pass it to Jalview via the command line + href="./commandline.html">command line

Passing command line arguments