Bård Skaflestad d3f85ea60c Merge remote-tracking branch 'upstream/master' into ert ...

Conflicts:
	Makefile.am
	opm/core/grid/cpgpreprocess/preprocess.h
	tests/Makefile.am

This brings ert branch up-to-date with current Github master branch.

2012-10-12 00:43:51 +02:00

..

initState_impl.hpp

Typo fix.

2012-09-14 20:56:08 +02:00

initState.hpp

Added initBlackoilSurfvol() function.

2012-05-21 14:03:56 +02:00

miscUtilities.cpp

Bugfix: order of function arguments.

2012-10-10 14:09:09 +02:00

miscUtilities.hpp

Fixed comment.

2012-09-03 12:26:22 +02:00

miscUtilitiesBlackoil.cpp

Add explanatory comment.

2012-10-02 15:46:33 +02:00

miscUtilitiesBlackoil.hpp

Change interface for (blackoil) computeInjectedProduced().

2012-10-02 11:12:23 +02:00

writeVtkData.hpp

Using Datamapper.h in writeVtkData

2012-06-28 13:20:18 +02:00