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

Conflicts:
	ResInsightVersion.cmake

2017-03-02 11:46:25 +01:00

..

Adm

Updated license information. Added Qwt and NRLib

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

Application

Merged branch dev into pre-proto

2017-02-27 14:03:33 +01:00

Commands

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

2017-03-02 11:46:25 +01:00

FileInterface

#1262 - pre-proto - Adding logging to reading of StimPlan XML files and writing of COMPDAT files.

2017-02-28 10:02:41 +01:00

GeoMech

#1255 Remove includes from header files

2017-02-24 11:07:26 +01:00

ModelVisualization

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

2017-03-02 11:46:25 +01:00

ProjectDataModel

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

2017-03-02 11:46:25 +01:00

ReservoirDataModel

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

2017-03-02 11:46:25 +01:00

Resources

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

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

ResultStatisticsCache

#1035 Adjusted the statistics calculators a bit.

2016-12-20 11:39:10 +01:00

SocketInterface

#1255 Remove includes from header files

2017-02-24 11:07:26 +01:00

UnitTests

pre-proto - Deleting line segments shorter than tolerance used when connecting line segments to polygons.

2017-02-03 14:12:40 +01:00

UserInterface

Merged branch dev into pre-proto

2017-02-27 14:03:33 +01: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