Merge remote-tracking branch 'refs/remotes/origin/dev'

This commit is contained in:
Magne Sjaastad
2017-02-27 07:13:06 +01:00
75 changed files with 1034 additions and 150 deletions

View File

@@ -19,6 +19,8 @@
#include "RigWellLogFile.h"
#include "RigWellLogCurveData.h"
#include "RimWellLogCurve.h"
#include "well.hpp"