opm-core/opm
Markus Blatt eeb0039683 Merge branch 'refactor-for-cpgrid-support' into master-refactor-for-cpgrid-support
Manually resolved conflicts in:
	opm/core/props/BlackoilPropertiesFromDeck.cpp
	opm/core/wells/WellsManager.cpp
2014-03-13 13:41:45 +01:00
..
core Merge branch 'refactor-for-cpgrid-support' into master-refactor-for-cpgrid-support 2014-03-13 13:41:45 +01:00