Merge branch 'dev' into pre-proto

This commit is contained in:
Magne Sjaastad
2017-08-11 16:14:00 +02:00
94 changed files with 1812 additions and 676 deletions

View File

@@ -37,7 +37,6 @@
#include "RimCellEdgeColors.h"
#include "RimCellRangeFilterCollection.h"
#include "RimCommandObject.h"
#include "RiaDefines.h"
#include "RimEclipseCaseCollection.h"
#include "RimEclipseCellColors.h"
#include "RimEclipseFaultColors.h"