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 remote-tracking branch 'refs/remotes/origin/dev'

Browse Source 
Conflicts:
	ApplicationCode/ProjectDataModel/RimEclipseWell.cpp
This commit is contained in:
Magne Sjaastad
2017-01-26 14:30:13 +01:00
parent 405cd382af d0f613520e
commit aedf184d14
21 changed files with 1092 additions and 262 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CMakeLists.txt
View File

@@ -185,7 +185,6 @@ else()
ecl_well
ert_geometry
ert_util
ert_utilxx
)
if (MSVC)