git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5646f33 28c784c)
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)
Conflicts:
src/jalview/datamodel/AlignmentAnnotation.java

1  2 
src/jalview/datamodel/AlignmentAnnotation.java patch | diff1 | diff2 | blob | history
src/jalview/datamodel/Sequence.java patch | diff1 | diff2 | blob | history
src/jalview/datamodel/SequenceI.java patch | diff1 | diff2 | blob | history
src/jalview/gui/PopupMenu.java patch | diff1 | diff2 | blob | history
src/jalview/renderer/AnnotationRenderer.java patch | diff1 | diff2 | blob | history

diff --cc src/jalview/datamodel/AlignmentAnnotation.java
index 1962423,6212d4d..2f5f270
--- 1/src/jalview/datamodel/AlignmentAnnotation.java
--- 2/src/jalview/datamodel/AlignmentAnnotation.java
+++ b/src/jalview/datamodel/AlignmentAnnotation.java
@@@ -1061,7 -1027,5 +1091,4 @@@ public class AlignmentAnnotatio
    {
      this.calcId = calcId;
    }
-   
-  
-   
 -
  }
diff --cc src/jalview/datamodel/Sequence.java
Simple merge
diff --cc src/jalview/datamodel/SequenceI.java
Simple merge
diff --cc src/jalview/gui/PopupMenu.java
Simple merge