opm-simulators/opm
Atgeirr Flø Rasmussen ebac36ddfc Merge branch 'master' into restructure-sim
Conflicts:
	opm/autodiff/SimulatorFullyImplicitBlackoil_impl.hpp
2014-08-13 00:02:42 +02:00
..
autodiff Merge branch 'master' into restructure-sim 2014-08-13 00:02:42 +02:00