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)
commit88f7d0a53dc11d3b23148fe0866b502b4b53b0e9
tree8a925bd3c2c284ab3db4975a5fe4082d9b43107a
parent4ea44eaccf82b15dafb8dd53f5c71de5e9d0d551
parentc00cfcb9f2223f1225fba57e5de85141cfa4570c
Merge branch 'develop' into bug/JAL-2346annotationChoice

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
src/jalview/appletgui/AnnotationColourChooser.java
src/jalview/gui/AnnotationColourChooser.java
src/jalview/gui/AnnotationRowFilter.java
src/jalview/gui/Jalview2XML.java
src/jalview/gui/PopupMenu.java
src/jalview/schemes/AnnotationColourGradient.java