OilfieldToolsNet/opm-simulators
4
0
Fork 0
mirror of https://github.com/OPM/opm-simulators.git synced 2024-12-18 21:43:27 -06:00
Code Issues Packages Projects Releases Wiki Activity
c6daebc35d
opm-simulators/opm
History
Markus Blatt c6daebc35d 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