git://source.jalview.org
/
jalview.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
b206034
e66bdc1
)
Merge branch 'JAL-1347' into develop
author
Jim Procter
<jprocter@compbio.dundee.ac.uk>
Thu, 11 Jul 2013 12:58:09 +0000
(13:58 +0100)
committer
Jim Procter
<jprocter@compbio.dundee.ac.uk>
Thu, 11 Jul 2013 12:58:09 +0000
(13:58 +0100)
1
2
src/jalview/renderer/AnnotationRenderer.java
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
src/jalview/renderer/AnnotationRenderer.java
Simple merge