opm-simulators/opm
Markus Blatt 7fd5b65691 Merge remote-tracking branch 'upstream/master' into parallel-solver-support
Removed conflicts in:
	opm/core/linalg/LinearSolverIstl.cpp
2014-04-04 20:38:52 +02:00
..
core Merge remote-tracking branch 'upstream/master' into parallel-solver-support 2014-04-04 20:38:52 +02:00