Magne Sjaastad 3c5016cb8c #1724 Fix merge issues

2017-08-04 10:45:04 +02:00

..

Adm

#1522 Update LicenseInformation.txt with nightcharts and opm-flowdiagnostics

2017-05-29 23:18:40 +02:00

Application

Merge branch 'dev' into pre-proto

2017-08-04 10:37:35 +02:00

CommandFileInterface

Merge branch 'dev' into pre-proto

2017-08-04 10:37:35 +02:00

Commands

Merge branch 'dev' into pre-proto

2017-08-04 10:37:35 +02:00

FileInterface

#1617 Adding conductivity scaling factor to StimPlan fracture templates, and scaling the conductivity values in file with this value.

2017-08-03 13:40:35 +02:00

GeoMech

Add const to several geomech functions

2017-06-19 20:49:06 +02:00

ModelVisualization

#1724 Fix merge issues

2017-08-04 10:45:04 +02:00

ProjectDataModel

Merge branch 'dev' into pre-proto

2017-08-04 10:37:35 +02:00

ReservoirDataModel

Merge branch 'dev' into pre-proto

2017-08-04 10:37:35 +02:00

Resources

Merge branch 'dev' into pre-proto

2017-06-05 11:40:13 +02:00

ResultStatisticsCache

#1292 Fixed CppCheck Issues in ReservoirDataModel

2017-03-06 11:58:07 +01:00

SocketInterface

#1596 Rename from RimDefines to RiaDefines

2017-06-13 15:41:52 +02:00

UnitTests

Merge branch 'dev' into pre-proto

2017-08-01 12:44:11 +02:00

UserInterface

Merge branch 'dev' into pre-proto

2017-08-01 12:44:11 +02:00

WellPathImportSsihub

#1476 Include isFile() when checking if a file exists

2017-05-11 09:23:13 +02:00

WellPathImportSsihubTestApp

Updated CMakeLists and set region default unselected

2013-09-25 11:33:16 +02:00

CMakeLists.txt

#1665 Add parameter and basic framework for executing command file

2017-07-26 16:41:17 +02:00

CustomPCH.cmake

Initial commit of ResInsight version 0.4.8

2012-05-18 09:45:23 +02:00

resinsight

Fixed missing dash in Linux startup script

2015-01-25 22:14:20 +01:00

resinsight.desktop.in

Put launcher for ResInsight in desktop environment

2013-03-27 00:43:13 +01:00