Resolved the branch merge conflicts with the zlib branch.
Showing
- src/bedToBam/bedToBam.cpp 1 addition, 1 deletionsrc/bedToBam/bedToBam.cpp
- src/intersectBed/intersectBed.cpp 20 additions, 9 deletionssrc/intersectBed/intersectBed.cpp
- src/intersectBed/intersectBed.h 3 additions, 0 deletionssrc/intersectBed/intersectBed.h
- src/utils/BamTools/BamAux.h 27 additions, 6 deletionssrc/utils/BamTools/BamAux.h
- src/utils/bedFile/bedFile.cpp 91 additions, 0 deletionssrc/utils/bedFile/bedFile.cpp
- src/utils/bedFile/bedFile.h 6 additions, 0 deletionssrc/utils/bedFile/bedFile.h
- src/utils/genomeFile/genomeFile.cpp 4 additions, 4 deletionssrc/utils/genomeFile/genomeFile.cpp
- src/utils/genomeFile/genomeFile.h 4 additions, 2 deletionssrc/utils/genomeFile/genomeFile.h
Loading
Please register or sign in to comment