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