git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 13f678a 13317fa)
Merge branch 'JAL-1587_promotedisorder' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Tue, 18 Nov 2014 09:57:09 +0000 (09:57 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Tue, 18 Nov 2014 09:57:09 +0000 (09:57 +0000)
1  2 
src/jalview/io/AppletFormatAdapter.java patch | diff1 | diff2 | blob | history
src/jalview/io/FormatAdapter.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/io/FormatAdapter.java
Simple merge