Merge branch 'develop' into bug/JAL-2346annotationChoice
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 30 Mar 2017 10:01:08 +0000 (11:01 +0100)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Thu, 30 Mar 2017 10:01:08 +0000 (11:01 +0100)
commitd5bcc3830eab04e6db816e1c2ad8fce1dc189612
tree7f609817141d18880b679b5c20004cd77c80e635
parent3ebdd4e28382e38a181aae1eed71549f603f9025
parentd7fd122bbdef3ab11f43ed6058fe37872d1d368e
Merge branch 'develop' into bug/JAL-2346annotationChoice

Conflicts:
src/jalview/gui/AnnotationRowFilter.java
src/jalview/datamodel/AlignmentAnnotation.java
src/jalview/gui/AnnotationRowFilter.java
src/jalview/gui/Jalview2XML.java