git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 95f6ef5 03496bf)
Merge branch 'features/typed_annotations_calcId' into develop
authorJim Procter <jprocter@dundee.ac.uk>
Wed, 12 Nov 2014 12:41:52 +0000 (12:41 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Wed, 12 Nov 2014 12:41:52 +0000 (12:41 +0000)
1  2 
src/jalview/gui/AlignFrame.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/jbgui/GAlignFrame.java
Simple merge