Merge branch 'develop' into develop_m2_8_1_2
authorJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 7 Jun 2013 14:17:04 +0000 (15:17 +0100)
committerJim Procter <jprocter@compbio.dundee.ac.uk>
Fri, 7 Jun 2013 14:17:04 +0000 (15:17 +0100)
commit0184787284a60624bd112260c0318889ade9fd56
tree7312f76c0d23c1543e0846e84df0ecdb2da57a79
parenta4462f60912bbb2661b5d3b444781e34563aeb67
parent08c9327201cdf77a77bf884f3c5fa45cdaf8bc7f
Merge branch 'develop' into develop_m2_8_1_2
tweaking to deal with my own conflict finessing
Conflicts:
src/jalview/io/StockholmFile.java
src/jalview/io/StockholmFile.java
src/jalview/renderer/AnnotationRenderer.java