git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 1997c87 cd825bd)
Merge branch 'features/JAL-1469_svg-output-for-figure-export' into Release_2_8_2_Branch
authorJim Procter <jprocter@dundee.ac.uk>
Thu, 13 Nov 2014 16:38:00 +0000 (16:38 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Thu, 13 Nov 2014 16:38:00 +0000 (16:38 +0000)
Conflicts:
.gitignore
src/jalview/gui/AlignmentPanel.java

1  2 
src/jalview/gui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/gui/AlignmentPanel.java patch | diff1 | diff2 | blob | history
src/jalview/jbgui/GAlignFrame.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/gui/AlignFrame.java
Simple merge
diff --cc src/jalview/gui/AlignmentPanel.java
Simple merge
diff --cc src/jalview/jbgui/GAlignFrame.java
Simple merge