git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0b22181 1eda025)
Merge branch 'develop' into bug/JAL-98consensusMemory
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 6 Oct 2016 12:55:50 +0000 (13:55 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 6 Oct 2016 12:55:50 +0000 (13:55 +0100)
1  2 
src/jalview/analysis/Conservation.java patch | diff1 | diff2 | blob | history
src/jalview/api/AlignViewportI.java patch | diff1 | diff2 | blob | history
src/jalview/renderer/AnnotationRenderer.java patch | diff1 | diff2 | blob | history
src/jalview/viewmodel/AlignmentViewport.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/api/AlignViewportI.java
Simple merge