]> git.donarmstrong.com Git - bamtools.git/commit - src/toolkit/bamtools_convert.cpp
Merge branch 'master' of http://github.com/pezmaster31/bamtools
authorErik Garrison <erik.garrison@bc.edu>
Fri, 17 Sep 2010 15:30:59 +0000 (11:30 -0400)
committerErik Garrison <erik.garrison@bc.edu>
Fri, 17 Sep 2010 15:30:59 +0000 (11:30 -0400)
commit9e7f3168db0c2473674f33a66eb63dedba0353f8
tree3d2762ffdc7bbe0de4f9912a56a83915b0499204
parent0ef88b963e167f9d66fe9e55d9c22c3863498b29
parent7124011e66fb0345c57b6f6046527049fda9f461
Merge branch 'master' of http://github.com/pezmaster31/bamtools

Conflicts:
src/api/BamIndex.cpp