Mark DePristo 03741fb640 Merge branch 'master' into rodRefactor ... Conflicts: public/java/src/org/broadinstitute/sting/gatk/walkers/annotator/VariantAnnotatorEngine.java public/java/test/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerIntegrationTest.java public/java/test/org/broadinstitute/sting/gatk/walkers/indels/IndelRealignerPerformanceTest.java public/java/test/org/broadinstitute/sting/utils/variantcontext/VariantContextIntegrationTest.java		2011-08-02 14:21:58 -04:00
..
config	Reorganized the codebase beneath top-level public and private directories,	2011-06-28 06:55:19 -04:00
src	Merge branch 'master' into rodRefactor	2011-08-02 14:21:58 -04:00
test	Merge branch 'master' into rodRefactor	2011-08-02 14:21:58 -04:00