Merge branch 'patch/JAL-2197_jpredforjnets' into develop
authorJim Procter <jprocter@issues.jalview.org>
Wed, 14 Dec 2016 15:08:14 +0000 (15:08 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 14 Dec 2016 15:08:14 +0000 (15:08 +0000)
commitcd4e2687751aab1c9c5974e6966e610a3332236b
tree9cbd6ff79be529f88bdd5f0018ae749d351a2b6d
parentc075b7f23933cbb3c6b1dda53d249d8cbefbe0b6
parenta8d1e3d9e96b19a53c1fc53e777991314ae4b7f2
Merge branch 'patch/JAL-2197_jpredforjnets' into develop
merge was missed for 2.10.1 release!
examples/appletDeployment.html
examples/applets.html
help/help.jhm
help/helpTOC.xml
help/html/menus/alignmentMenu.html
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/appletgui/AlignFrame.java
src/jalview/bin/JalviewLite.java
src/jalview/ws/jws1/Discoverer.java
src/jalview/ws/jws1/JPredClient.java