Merge branch 'JAL-1161_optimisingAnnotationPanel' into develop
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 7 Jun 2013 13:55:23 +0000 (14:55 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 7 Jun 2013 13:55:23 +0000 (14:55 +0100)
commit08c9327201cdf77a77bf884f3c5fa45cdaf8bc7f
treecdd5e6b0745240d0de4352a4f101c71764b59c5f
parent9639e7f64e28909a2cc91864ff7399115a844464
parent72b2149f3f011d7d4c6fe861648d0b594ce2299e
Merge branch 'JAL-1161_optimisingAnnotationPanel' into develop

Conflicts:
src/jalview/datamodel/Annotation.java
src/jalview/io/AppletFormatAdapter.java
src/jalview/io/StockholmFile.java
src/jalview/renderer/AnnotationRenderer.java
Feature conflict left unresolved - JAL-1081 (Pseuodknots) which utilises VARNA to process stockholm annotation data
src/jalview/datamodel/Annotation.java
src/jalview/io/AppletFormatAdapter.java
src/jalview/io/FileLoader.java
src/jalview/io/StockholmFile.java
src/jalview/renderer/AnnotationRenderer.java