Bård Skaflestad 31174cf727 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

..

CornerpointChopper.hpp

bugfix

2012-02-07 10:22:47 +01:00

EclipseGridInspector.cpp

Changed namespace Dune -> namespace Opm.

2012-01-19 13:50:57 +01:00

EclipseGridInspector.hpp

Changed namespace Dune -> namespace Opm.

2012-01-19 13:50:57 +01:00

EclipseGridParser.cpp

Don't compare signed to unsigned integer types.

2012-10-01 17:37:18 +02:00

EclipseGridParser.hpp

Merge branch 'master' into ert

2012-09-05 13:36:19 +02:00

EclipseGridParserHelpers.hpp

Improve comment.

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

EclipseUnits.hpp

Added reading of polymer related keywords.

2012-02-27 11:13:08 +01:00

SpecialEclipseFields.hpp

Fix bug in GCONINJE input.

2012-10-10 14:16:11 +02:00