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

..

compute_tof.cpp

Fix comment.

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

Makefile.am

Merge remote-tracking branch 'upstream/master' into ert

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

refine_wells.cpp

Added program refine_wells.

2012-05-24 09:18:37 +02:00

scaneclipsedeck.c

Conform to C90 standard (don't mix declaration and code).

2011-12-08 16:40:43 +01:00

sim_2p_comp_reorder.cpp

Merge remote-tracking branch 'upstream/master'

2012-09-05 13:35:48 +02:00

sim_2p_incomp_reorder.cpp

Fix pressure renormalization conditions. Some formatting fixes.

2012-08-21 14:52:43 +02:00

sim_wateroil.cpp

Merge remote-tracking branch 'upstream/master'

2012-09-05 13:35:48 +02:00

spu_2p.cpp

Merge branch 'master' into ert

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

wells_example.cpp

Constructors of *FromDeck classes now take an UnstructuredGrid.

2012-08-10 10:12:45 +02:00