Merge branch 'dev' into pre-proto

This commit is contained in:
Bjørnar Grip Fjær
2017-08-01 12:44:11 +02:00
128 changed files with 5129 additions and 423 deletions

View File

@@ -20,7 +20,7 @@
#include "RiaApplication.h"
#include "RicExportMultipleSnapshotsFeature.h"
#include "ExportCommands/RicExportMultipleSnapshotsFeature.h"
#include "RimCase.h"
#include "RimEclipseCellColors.h"