Magne Sjaastad 36bcdab426 Merge remote-tracking branch 'refs/remotes/origin/dev' ...

Conflicts:
	ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.h
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/UserInterface/RiuViewerCommands.cpp

2017-01-18 12:19:07 +01:00

..

custom-clipper

pre-proto - Adding clipper library version 6.4.0 to be used for polygon clipping

2017-01-16 09:40:26 +01:00

custom-opm-common

#804 Updated opm-common based on

2016-10-13 13:40:43 +02:00

custom-opm-flowdiag-app

opm-flowdiagnostics updated to 80190c28ae0fd4a82cfe88c827559029982db83b

2017-01-05 14:57:25 +01:00

custom-opm-flowdiagnostics

#1117 Temporary patch from @bska. Waiting for an update to the opm-flowdiagnostics library

2017-01-16 09:27:51 +01:00

custom-opm-parser

#804 Updated opm-parser based on

2016-10-13 13:40:44 +02:00

Ert

#926 Eclipse Input Data : Do not abort for keywords with more than eight characters

2016-11-25 16:56:26 +01:00

gtest

Made the output from g-test a bit more readable

2016-10-17 15:15:27 +02:00

NRLib

#886 LAS Export: Set the STEP if the data is resampled

2016-09-23 10:20:05 +02:00

Qwt

Added Qwt library and basic classes for well log viewer

2015-08-26 12:27:29 +02:00