opm-simulators/opm
Markus Blatt 46f3607641 Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support
Resolved conflicts:
	opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
2014-03-31 11:39:37 +02:00
..
autodiff Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support 2014-03-31 11:39:37 +02:00