git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 25883b5 c70b1cb)
Merge branch 'develop' into features/JAL-1152annotationSorting
authorJim Procter <jprocter@dundee.ac.uk>
Mon, 3 Nov 2014 16:02:18 +0000 (16:02 +0000)
committerJim Procter <jprocter@dundee.ac.uk>
Mon, 3 Nov 2014 16:02:18 +0000 (16:02 +0000)
1  2 
src/jalview/gui/AlignFrame.java patch | diff1 | diff2 | blob | history
src/jalview/gui/PopupMenu.java patch | diff1 | diff2 | blob | history

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