]> git.donarmstrong.com Git - bamtools.git/commit
Merge branch 'master' of git://github.com/pezmaster31/bamtools
authorErik Garrison <erik.garrison@bc.edu>
Wed, 8 Sep 2010 19:36:39 +0000 (15:36 -0400)
committerErik Garrison <erik.garrison@bc.edu>
Wed, 8 Sep 2010 19:36:39 +0000 (15:36 -0400)
commit90bb3691f9aa2a2e8a4dd906c2439c7bc434eb78
tree22b5c4679eabf8f2455fd0ce55e85525ec80388b
parent1ee9b6b3d98a4bfd5a60c583bc7847c545a60e32
parent1d03f81d725ffedeac9d9d73a2058f00cfc0b0e4
Merge branch 'master' of git://github.com/pezmaster31/bamtools

Conflicts:
src/api/BamReader.cpp
src/api/BamAux.h
src/api/BamIndex.cpp
src/api/BamReader.cpp