]> git.donarmstrong.com Git - bamtools.git/commitdiff
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)
Conflicts:
src/api/BamIndex.cpp


Trivial merge