git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from: 88f7d0a)
Merge branch 'develop' into bug/JAL-2346annotationChoice
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 14 Feb 2017 12:34:54 +0000 (12:34 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Tue, 14 Feb 2017 12:34:54 +0000 (12:34 +0000)
Conflicts:
src/jalview/appletgui/AnnotationColourChooser.java
src/jalview/gui/AnnotationRowFilter.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/PopupMenu.java
src/jalview/schemes/AnnotationColourGradient.java


No differences found