Clone
Jim Procter <jprocter@dundee.ac.uk>
committed
6 years and 11 months ago
Merge: 497958b 68dcaa7 (fake synthesised by jbp)
Merge branch 'develop' into JAL-1483_29dev
Conflicts:
src/jalview/api/AlignmentViewP… Show more
Merge: 497958b 68dcaa7 (fake synthesised by jbp)

Merge branch 'develop' into JAL-1483_29dev

Conflicts:

      src/jalview/api/AlignmentViewPanel.java

      src/jalview/appletgui/SeqPanel.java

      src/jalview/gui/AlignFrame.java

      src/jalview/gui/AlignViewport.java

      src/jalview/gui/AnnotationExporter.java

      src/jalview/gui/FeatureRenderer.java

      src/jalview/gui/FeatureSettings.java

      src/jalview/gui/Jalview2XML.java

      src/jalview/gui/Jalview2XML_V1.java

      src/jalview/gui/PopupMenu.java

      src/jalview/gui/SeqPanel.java

Show less

master + 590 more