Atgeirr Flø Rasmussen 9c77d12f8d Merge branch 'master' into ert ...

Conflicts:
	Makefile.am
	configure.ac
	examples/Makefile.am
	opm/core/GridManager.cpp
	opm/core/eclipse/EclipseGridParser.cpp
	opm/core/grid/cpgpreprocess/preprocess.h
	tests/Makefile.am

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

..

fluid

Massive whitespace cleanup: entire fluid subdir.

2012-09-05 11:28:54 +02:00

linalg

Restore coding conventions.

2012-08-14 11:05:09 +02:00

pressure

Merge remote-tracking branch 'atgeirr/master'

2012-08-27 13:32:55 +02:00

simulator

Added writing of timings in param format

2012-08-21 09:57:36 +02:00

transport/reorder

Corrected comment.

2012-08-28 13:12:54 +02:00

utility

Merge branch 'master' into ert

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

wells

Prune an unused header.

2012-06-19 09:34:34 +02:00

newwells.h

Document add_well()s "name" parameter.

2012-06-18 10:18:14 +02:00

well.h

Document the obsolescent well representation.

2012-06-25 00:55:50 +02:00