]> git.donarmstrong.com Git - samtools.git/commit
Merge branch 'master' of github.com:samtools/samtools into mt
authorHeng Li <lh3@me.com>
Thu, 29 Mar 2012 18:05:37 +0000 (14:05 -0400)
committerHeng Li <lh3@me.com>
Thu, 29 Mar 2012 18:05:37 +0000 (14:05 -0400)
commit0ab78ddb98818366103c11330526b8a2ea33a757
tree9177de3d6def04690a18e23022934586f7b18f75
parentfbb4b1356096b31bb5f1956f864f4c76b21565f6
parent7e7b21944f4d89442896d1618f65c22b509c0326
Merge branch 'master' of github.com:samtools/samtools into mt

Conflicts:
misc/Makefile

Also, killed warnings on Mac
misc/Makefile
misc/bamcheck.c
padding.c