Guillermo del Angel 418ace463a More merge conflict resolution		2012-08-21 10:15:52 -04:00
..
src/org/broadinstitute/sting	Fixing merge conflicts	2012-08-20 20:38:25 -04:00
test/org/broadinstitute/sting/gatk/walkers	Re-enabling parallelism in the BaseRecalibrator now that the release is out.	2012-08-20 21:25:14 -04:00