Solve merge issues merging in updates from slb-master
Showing
- segysdk/src/segysdk/SegySessionImpl.h 0 additions, 8 deletionssegysdk/src/segysdk/SegySessionImpl.h
- segysdk/src/tools/SampleCode/Common/SessionUtilities.cpp 5 additions, 10 deletionssegysdk/src/tools/SampleCode/Common/SessionUtilities.cpp
- segysdk/src/tools/SegyIndexerService/SegyIndexUtilities/SeismicTraceDataUtilities.cpp 2 additions, 3 deletions...rService/SegyIndexUtilities/SeismicTraceDataUtilities.cpp
- segysdk/src/tools/SegyIndexerService/SegyIndexUtilities/SeismicTraceDataUtilities.h 1 addition, 1 deletion...xerService/SegyIndexUtilities/SeismicTraceDataUtilities.h
- segysdk/src/tools/SegyIndexerService/SegyIndexing/SegyIndexerService.cpp 2 additions, 9 deletions...ls/SegyIndexerService/SegyIndexing/SegyIndexerService.cpp
Loading
Please register or sign in to comment