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

@@ -23,13 +23,16 @@
#include "RiaApplication.h"
#include "RiaPreferences.h"
#include "RigWellPath.h"
#include "RimProject.h"
#include "RimWellPath.h"
#include "RimWellLogFile.h"
#include "RivWellPathCollectionPartMgr.h"
#include "RimWellPath.h"
#include "RiuMainWindow.h"
#include "RivWellPathCollectionPartMgr.h"
#include "cafPdmUiEditorHandle.h"
#include "cafProgressInfo.h"