Merge branch 'develop' into features/JAL-1723_sequenceReport
authorgmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 31 Oct 2016 10:25:06 +0000 (10:25 +0000)
committergmungoc <g.m.carstairs@dundee.ac.uk>
Mon, 31 Oct 2016 10:25:06 +0000 (10:25 +0000)
commita86ad83f39c98c9a06d08a1ba1fa8b529d30a63c
tree73e4ab2661113672e59f60e56ad50202b1bf3703
parent054cc21f3aad9e37c464b1af6c62dbee6ca624b1
parentc242d1bd498f606f87c5f3c7854b469dd7120730
Merge branch 'develop' into features/JAL-1723_sequenceReport

Conflicts:
src/jalview/io/SequenceAnnotationReport.java
src/jalview/appletgui/APopupMenu.java
src/jalview/gui/IdPanel.java
src/jalview/gui/PopupMenu.java
src/jalview/gui/SeqPanel.java
src/jalview/io/SequenceAnnotationReport.java
test/jalview/io/SequenceAnnotationReportTest.java