git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c075b7f a8d1e3d)
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)
merge was missed for 2.10.1 release!

1  2 
examples/appletDeployment.html patch | diff1 | diff2 | blob | history
examples/applets.html patch | diff1 | diff2 | blob | history
help/help.jhm patch | diff1 | diff2 | blob | history
help/helpTOC.xml patch | diff1 | diff2 | blob | history
help/html/menus/alignmentMenu.html patch | diff1 | diff2 | blob | history
resources/lang/Messages.properties patch | diff1 | diff2 | blob | history
resources/lang/Messages_es.properties patch | diff1 | diff2 | blob | history
src/jalview/appletgui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/bin/JalviewLite.java patch | diff1 | diff2 | blob | history
src/jalview/ws/jws1/Discoverer.java patch | diff1 | diff2 | blob | history
src/jalview/ws/jws1/JPredClient.java patch | diff1 | diff2 | blob | history

diff --cc examples/appletDeployment.html
Simple merge
diff --cc examples/applets.html
Simple merge
diff --cc help/help.jhm
Simple merge
diff --cc help/helpTOC.xml
Simple merge
diff --cc help/html/menus/alignmentMenu.html
Simple merge
diff --cc resources/lang/Messages.properties
Simple merge
diff --cc resources/lang/Messages_es.properties
Simple merge
diff --cc src/jalview/appletgui/AlignFrame.java
Simple merge
diff --cc src/jalview/bin/JalviewLite.java
Simple merge
diff --cc src/jalview/ws/jws1/Discoverer.java
Simple merge
diff --cc src/jalview/ws/jws1/JPredClient.java
Simple merge