projects
/
pysam.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
768881f
920cc77
)
Merge tag 'upstream/0.7'
author
Diane Trout
<diane@caltech.edu>
Tue, 18 Dec 2012 19:58:26 +0000
(11:58 -0800)
committer
Diane Trout
<diane@caltech.edu>
Tue, 18 Dec 2012 19:58:26 +0000
(11:58 -0800)
Upstream version 0.7
Conflicts:
pysam/csamtools.c
pysam/ctabix.c
Upstream and debian policy disagree about the presence
of the cython c files.
Trivial merge