Magne Sjaastad 8255a3aaa3 Merge branch 'dev' into pre-proto

2017-04-03 07:34:56 +02:00

..

Adm

Updated license information. Added Qwt and NRLib

2015-11-03 11:29:57 +01:00

Application

Merge branch 'dev' into pre-proto

2017-04-03 07:34:56 +02:00

Commands

Merge branch 'dev' into pre-proto

2017-04-03 07:34:56 +02:00

FileInterface

#1364 - pre-proto - Fixing bugs in calculation of upscaled cond values

2017-03-31 10:25:24 +02:00

GeoMech

#1322 Added support for geo mech data

2017-03-21 13:17:04 +01:00

ModelVisualization

Merge branch 'dev' into pre-proto

2017-04-03 07:34:56 +02:00

ProjectDataModel

Merge branch 'dev' into pre-proto

2017-04-03 07:34:56 +02:00

ReservoirDataModel

Merge branch 'dev' into pre-proto

2017-04-03 07:34:56 +02:00

Resources

Merge remote-tracking branch 'refs/remotes/origin/dev'

2017-02-16 10:18:39 +01:00

ResultStatisticsCache

#1292 Fixed CppCheck Issues in ReservoirDataModel

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

SocketInterface

Renamed to eclipseCaseData

2017-03-15 09:10:16 +01:00

UnitTests

Merge remote-tracking branch 'origin/dev' into pre-proto

2017-03-15 10:10:43 +01:00

UserInterface

Merge branch 'dev' into pre-proto

2017-04-03 07:34:56 +02:00

WellPathImportSsihub

#1255 Removed include to RimOilRegion

2017-02-24 13:32:25 +01:00

WellPathImportSsihubTestApp

Updated CMakeLists and set region default unselected

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

CMakeLists.txt

#1254 Infrastructure for logging including Messages dock widget

2017-02-23 15:02:55 +01: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

RiaMain.cpp

#1254 Infrastructure for logging including Messages dock widget

2017-02-23 15:02:55 +01:00