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

Merge dev into pre-proto

Browse Source 
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseView.cpp
	ApplicationCode/ProjectDataModel/RimEclipseView.h
This commit is contained in:
Magne Sjaastad
2017-01-10 10:09:44 +01:00
parent 95864e8ae8 8970d93a4d
commit 9cd17ec508
142 changed files with 1759 additions and 937 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
ApplicationCode/ProjectDataModel/RimProject.h
View File

@@ -26,7 +26,7 @@
#include <vector>
class RigCaseData;
class RigEclipseCaseData;
class RigGridManager;
class RigMainGrid;