Markus Blatt 8df314e90f Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support ... Manually resolved conficts in the following files examples/sim_fibo_ad.cpp opm/autodiff/FullyImplicitBlackoilSolver_impl.hpp opm/autodiff/SimulatorFullyImplicitBlackoil_impl.hpp In additions examples/sim_fibo_ad_cp.cpp was adapted to compile again.		2014-03-25 11:11:08 +01:00
..
autodiff	Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support	2014-03-25 11:11:08 +01:00