merge conflicts
Branches nkindlon-master2
No related tags found
Showing
- Makefile 1 addition, 1 deletionMakefile
- src/bedtools.cpp 3 additions, 3 deletionssrc/bedtools.cpp
- src/closestBed/closestBed.cpp 0 additions, 289 deletionssrc/closestBed/closestBed.cpp
- src/closestBed/closestBed.h 0 additions, 66 deletionssrc/closestBed/closestBed.h
- src/closestFile/Makefile 44 additions, 0 deletionssrc/closestFile/Makefile
- src/closestFile/closestFile.cpp 41 additions, 0 deletionssrc/closestFile/closestFile.cpp
- src/closestFile/closestFile.h 31 additions, 0 deletionssrc/closestFile/closestFile.h
- src/closestFile/closestMain.cpp 107 additions, 0 deletionssrc/closestFile/closestMain.cpp
- src/utils/Contexts/ContextClosest.cpp 222 additions, 0 deletionssrc/utils/Contexts/ContextClosest.cpp
- src/utils/Contexts/ContextClosest.h 65 additions, 0 deletionssrc/utils/Contexts/ContextClosest.h
- src/utils/Contexts/Makefile 6 additions, 4 deletionssrc/utils/Contexts/Makefile
- src/utils/FileRecordTools/Records/Record.cpp 1 addition, 1 deletionsrc/utils/FileRecordTools/Records/Record.cpp
- src/utils/NewChromsweep/CloseSweep.cpp 426 additions, 0 deletionssrc/utils/NewChromsweep/CloseSweep.cpp
- src/utils/NewChromsweep/CloseSweep.h 53 additions, 0 deletionssrc/utils/NewChromsweep/CloseSweep.h
- src/utils/NewChromsweep/Makefile 41 additions, 39 deletionssrc/utils/NewChromsweep/Makefile
- src/utils/NewChromsweep/NewChromsweep.cpp 252 additions, 254 deletionssrc/utils/NewChromsweep/NewChromsweep.cpp
- src/utils/NewChromsweep/NewChromsweep.h 12 additions, 12 deletionssrc/utils/NewChromsweep/NewChromsweep.h
- src/utils/RecordOutputMgr/Makefile 39 additions, 39 deletionssrc/utils/RecordOutputMgr/Makefile
- src/utils/RecordOutputMgr/RecordOutputMgr.cpp 502 additions, 462 deletionssrc/utils/RecordOutputMgr/RecordOutputMgr.cpp
- src/utils/RecordOutputMgr/RecordOutputMgr.h 76 additions, 72 deletionssrc/utils/RecordOutputMgr/RecordOutputMgr.h
Loading
Please register or sign in to comment