OilfieldToolsNet/ResInsight
4
0
Fork 0
mirror of https://github.com/OPM/ResInsight.git synced 2026-09-03 20:53:13 -05: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
ApplicationCode/ProjectDataModel/RimProject.cpp
+4 -1
View File
@@ -23,7 +23,8 @@
#include "RiaApplication.h"
#include "RiaVersionInfo.h"
#include "RigCaseData.h"
#include "RigEclipseCaseData.h"
#include "RigGridBase.h"
#include "RimCalcScript.h"
#include "RimCase.h"
@@ -60,6 +61,8 @@
#include "cafCmdFeatureManager.h"
#include "cafPdmUiTreeOrdering.h"
#include "cvfBoundingBox.h"
#include <QDir>
#include <QMenu>