Merge branch 'develop' into menard
authorjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 31 Aug 2012 15:40:52 +0000 (16:40 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Fri, 31 Aug 2012 15:40:52 +0000 (16:40 +0100)
commit27e20b88d0c73ced06e9c20a6e0fa14e27fed179
treec2f54bf76c1b78c46bf325995bc4c0c2340e88f7
parent5646f33d5e9dcbf30339abb53f2fca40d0f768b3
parent28c784ca383b0a81c4d0a8a31ee1456b40d4b152
Merge branch 'develop' into menard

Conflicts:
src/jalview/datamodel/AlignmentAnnotation.java
src/jalview/datamodel/AlignmentAnnotation.java
src/jalview/datamodel/Sequence.java
src/jalview/datamodel/SequenceI.java
src/jalview/gui/PopupMenu.java
src/jalview/renderer/AnnotationRenderer.java