git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 237d623 9cf7cc9)
Merge branch 'develop' into trialmerge/JAL-1950_hmmer3client
authorJim Procter <jprocter@issues.jalview.org>
Tue, 12 Apr 2016 14:19:10 +0000 (15:19 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Tue, 12 Apr 2016 14:19:10 +0000 (15:19 +0100)
1  2 
src/jalview/datamodel/AlignmentAnnotation.java patch | diff1 | diff2 | blob | history
src/jalview/gui/AlignViewport.java patch | diff1 | diff2 | blob | history
src/jalview/util/Comparison.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/gui/AlignViewport.java
Simple merge
diff --cc src/jalview/util/Comparison.java
Simple merge