opm-simulators/opm
Markus Blatt b279a174db Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support
Conflicts:
	examples/sim_fibo_ad.cpp
	opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp
2014-03-27 16:17:44 +01:00
..
autodiff Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support 2014-03-27 16:17:44 +01:00