Magne Sjaastad 842363eebd WIP resolved conflicts

2015-09-18 13:46:18 +02:00

..

CMakeLists_files.cmake

(#486) Renamed "trace" to "track"

2015-09-18 12:29:23 +02:00

RicAddWellLogToPlotFeature.cpp

WIP resolved conflicts

2015-09-18 13:46:18 +02:00

RicAddWellLogToPlotFeature.h

Renamed class/flies

2015-09-18 09:16:59 +02:00

RicNewWellLogCurveExtractionFeature.cpp

WIP resolved conflicts

2015-09-18 13:46:18 +02:00

RicNewWellLogCurveExtractionFeature.h

(#486) Renamed "trace" to "track"

2015-09-18 12:29:23 +02:00

RicNewWellLogCurveLasFeature.cpp

WIP resolved conflicts

2015-09-18 13:46:18 +02:00

RicNewWellLogCurveLasFeature.h

(#486) Renamed "trace" to "track"

2015-09-18 12:29:23 +02:00

RicNewWellLogPlotFeature.cpp

(#486) Renamed "trace" to "track"

2015-09-18 12:29:23 +02:00

RicNewWellLogPlotFeature.h

(#492) Created folder for well log commands, added "New Well Log LAS Curve" feature

2015-09-18 09:07:38 +02:00

RicNewWellLogPlotFeatureImpl.cpp

(#492) Created folder for well log commands, added "New Well Log LAS Curve" feature

2015-09-18 09:07:38 +02:00

RicNewWellLogPlotFeatureImpl.h

(#492) Created folder for well log commands, added "New Well Log LAS Curve" feature

2015-09-18 09:07:38 +02:00

RicNewWellLogPlotTrackFeature.cpp

(#486) Renamed "trace" to "track"

2015-09-18 12:29:23 +02:00

RicNewWellLogPlotTrackFeature.h

(#486) Renamed "trace" to "track"

2015-09-18 12:29:23 +02:00

RicWellLogPlotCurveFeatureImpl.cpp

(#492) Created folder for well log commands, added "New Well Log LAS Curve" feature

2015-09-18 09:07:38 +02:00

RicWellLogPlotCurveFeatureImpl.h

(#492) Created folder for well log commands, added "New Well Log LAS Curve" feature

2015-09-18 09:07:38 +02:00

RicWellLogsImportFileFeature.cpp

(#492) Created folder for well log commands, added "New Well Log LAS Curve" feature

2015-09-18 09:07:38 +02:00

RicWellLogsImportFileFeature.h

(#492) Created folder for well log commands, added "New Well Log LAS Curve" feature

2015-09-18 09:07:38 +02:00