Merged in changes from maintenance branch

This commit is contained in:
Magne Sjaastad
2016-08-11 10:29:14 +02:00
11 changed files with 259 additions and 51 deletions

View File

@@ -57,6 +57,7 @@ protected:
virtual void defineUiTreeOrdering(caf::PdmUiTreeOrdering& uiTreeOrdering, QString uiConfigName = "") override;
friend class RimEclipseFaultColors;
friend class RimCellEdgeColors;
virtual void initAfterRead();
private: