Merge branch 'patch/JAL-2197_jpredforjnets' into releases/Release_2_10_Branch releases/Release_2_10_Branch
authorJim Procter <jprocter@issues.jalview.org>
Wed, 14 Dec 2016 15:07:13 +0000 (15:07 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 14 Dec 2016 15:07:13 +0000 (15:07 +0000)
merge was missed for 30th November release.

1  2 
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

Simple merge
Simple merge
diff --cc help/help.jhm
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge