Merge branch 'features/JAL-1723_sequenceReport' into develop
authorJim Procter <jprocter@issues.jalview.org>
Wed, 16 Nov 2016 17:12:43 +0000 (17:12 +0000)
committerJim Procter <jprocter@issues.jalview.org>
Wed, 16 Nov 2016 17:13:41 +0000 (17:13 +0000)
commitd0d8e3e2f528581af454e5b2a51372a9f4677114
treea3d044014184ed76645bf524a5b72fff65a0a349
parent38fbc3735711f0914fe0c96767371ba386186411
parent9a0f307f1fea87200c2ce905073942570795c6cc
Merge branch 'features/JAL-1723_sequenceReport' into develop

 Conflicts:
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/io/SequenceAnnotationReport.java
reconciled refactored report/ellipsis code with refactored URLLink code for generating dynamic links with ACCESSION_ID tokens
resources/lang/Messages.properties
resources/lang/Messages_es.properties
src/jalview/appletgui/APopupMenu.java
src/jalview/gui/IdPanel.java
src/jalview/gui/PopupMenu.java
src/jalview/io/SequenceAnnotationReport.java