ResInsight/ApplicationCode
Magne Sjaastad 36bcdab426 Merge remote-tracking branch 'refs/remotes/origin/dev'
Conflicts:
	ApplicationCode/ModelVisualization/RivPipeGeometryGenerator.h
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
	ApplicationCode/ProjectDataModel/RimEclipseWell.h
	ApplicationCode/UserInterface/RiuViewerCommands.cpp
2017-01-18 12:19:07 +01:00
..
Adm Updated license information. Added Qwt and NRLib 2015-11-03 11:29:57 +01:00
Application #1107 #1111 Added update of well allocation plot from 3D view 2017-01-13 13:32:17 +01:00
Commands Merge remote-tracking branch 'refs/remotes/origin/dev' 2017-01-18 12:19:07 +01:00
FileInterface Merge remote-tracking branch 'refs/remotes/origin/dev' 2017-01-18 12:19:07 +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-01-18 12:19:07 +01:00
ProjectDataModel Merge remote-tracking branch 'refs/remotes/origin/dev' 2017-01-18 12:19:07 +01:00
ReservoirDataModel Merge remote-tracking branch 'refs/remotes/origin/dev' 2017-01-18 12:19:07 +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 #1068 Renamed to RigEclipseCaseData 2017-01-10 09:51:39 +01:00
UserInterface Merge remote-tracking branch 'refs/remotes/origin/dev' 2017-01-18 12:19:07 +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 Merge remote-tracking branch 'refs/remotes/origin/dev' 2017-01-18 12:19:07 +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