OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2025-02-25 18:55:39 -06:00
Code Issues Packages Projects Releases Wiki Activity
13,992 Commits 28 Branches 61 Tags
dc0607dfd399495c40f5e55eba5da33ac8204d4e
Commit Graph

57 Commits

Author SHA1 Message Date
Magne Sjaastad
9cd17ec508 Merge dev into pre-proto 
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseView.cpp
	ApplicationCode/ProjectDataModel/RimEclipseView.h
 2017-01-10 10:09:44 +01:00
Magne Sjaastad
8970d93a4d #1068 Renamed to RigEclipseCaseData 2017-01-10 09:51:39 +01:00
Magne Sjaastad
ccd4cb24c9 #1068 Avoid include of RigMainGrid.h in RigCaseData.h 2017-01-10 09:20:03 +01:00
Magne Sjaastad
0fd3bc8865 #1068 Access mainGrid directly from RimEclipseView 2017-01-09 10:51:06 +01:00
astridkbjorke
a5e8001745 #1044 - pre-proto - Fixed eternal loop 2017-01-04 09:28:10 +01:00
Magne Sjaastad
51e8cae11b Added branch index to source info as basis for more work on #1044 2017-01-03 11:11:36 +01:00
Magne Sjaastad
276eaf0f33 Rename 2017-01-03 10:09:57 +01:00