Merged bug fix from Stable into Unstable

Browse Source

Resolved merge conflicts

Conflicts:
	private/java/test/org/broadinstitute/sting/gatk/walkers/na12878kb/core/MongoVariantContextUnitTest.java
	private/java/test/org/broadinstitute/sting/gatk/walkers/na12878kb/core/NA12878KBUnitTestBase.java

...

This commit is contained in:

David Roazen 2012-12-19 10:39:21 -05:00

parent 07b369ca7e 3ad45223be

commit f2f8172d0c

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available