Magne Sjaastad 7738b7f74b Fixed merge issue		2017-02-03 10:52:22 +01:00
..
Adm	Updated license information. Added Qwt and NRLib	2015-11-03 11:29:57 +01:00
Application	Assign default colors to wells when importing case from file	2017-02-02 10:35:15 +01:00
Commands	Merge remote-tracking branch 'refs/remotes/origin/dev'	2017-02-03 10:51:46 +01:00
FileInterface	#1157 - pre-proto - Updating how the eclipseCase is handled for transmissibility calculation. Should now avoid segfault when calculating transmissibilities for well path fractures.	2017-02-02 08:50:54 +01:00
GeoMech	Merge branch 'dev' of https://github.com/OPM/ResInsight.git	2016-12-20 14:43:28 +01:00
ModelVisualization	Merge remote-tracking branch 'refs/remotes/origin/dev'	2017-02-03 10:51:46 +01:00
ProjectDataModel	Fixed merge issue	2017-02-03 10:52:22 +01:00
ReservoirDataModel	Merge remote-tracking branch 'refs/remotes/origin/dev'	2017-02-03 10:51:46 +01:00
Resources	#1071 Updated icons for fractures	2017-01-05 14:57:04 +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	#1091 - pre-proto - Adding function for calculating fracture length.	2017-01-27 12:12:08 +01:00
UserInterface	Merge remote-tracking branch 'refs/remotes/origin/dev'	2017-02-03 10:51:46 +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	#1078 Context menu commands for multi select of EclipseWell objects	2017-01-26 07:23:18 +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