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

Conflicts:
	ApplicationCode/ModelVisualization/CMakeLists_files.cmake
	ApplicationCode/ModelVisualization/RivWellPathPartMgr.cpp

2017-02-20 11:07:46 +01:00

..

Adm

Updated license information. Added Qwt and NRLib

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

Application

#1230 Added infrastructure for loadAndUpdate of StimPlan data

2017-02-17 09:29:46 +01:00

Commands

#1234 - pre-proto - Adding commands for converting units for all ellipse fracture templates (metric <--> field)

2017-02-20 09:13:44 +01:00

FileInterface

Merged branch dev into pre-proto

2017-02-17 11:38:32 +01:00

GeoMech

#1233 Improve system for setting part priorities

2017-02-18 12:38:15 +01:00

ModelVisualization

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

2017-02-20 11:07:46 +01:00

ProjectDataModel

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

2017-02-20 11:07:46 +01:00

ReservoirDataModel

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

2017-02-20 11:07:46 +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

Cleaned up includes

2017-01-17 15:11:02 +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-17 11:38:32 +01:00

WellPathImportSsihub

System : Removed unnecessary use of xmlObj macro

2016-12-12 07:29:44 +01:00

WellPathImportSsihubTestApp

Updated CMakeLists and set region default unselected

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

CMakeLists.txt

#1228 Removed bundling of Qt lib files on Linux

2017-02-19 17:00:46 +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

(#687) Improved launch of unit tests from command line

2015-12-03 10:33:38 +01:00