git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d50ff0 2a9991e)
Merge branch 'features/JAL-653_gffalignments' into trial/JAL-1780_JAL-653
authorJim Procter <jprocter@issues.jalview.org>
Wed, 17 Jun 2015 15:42:09 +0000 (16:42 +0100)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 17 Jun 2015 15:42:09 +0000 (16:42 +0100)
1  2 
src/jalview/appletgui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/gui/AlignFrame.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/appletgui/AlignFrame.java
Simple merge
diff --cc src/jalview/gui/AlignFrame.java
Simple merge