osae 5df819d509 Merge branch 'master' of git://github.com/OPM/opm-core ... Conflicts: CMakeLists_files.cmake		2014-03-26 14:51:06 +01:00
..
compute_initial_state.cpp	Added simple program example for initialisation.	2014-02-27 13:55:15 +01:00
compute_tof_from_files.cpp	catch all exceptions in all tutorials and examples	2013-09-05 13:04:38 +02:00
compute_tof.cpp	Removed WellsManager constructor which takes an ole Eclipsegridparser instance.	2014-03-25 18:57:58 +01:00
import_rewrite.cpp	catch all exceptions in all tutorials and examples	2013-09-05 13:04:38 +02:00
sim_2p_comp_reorder.cpp	Removed WellsManager constructor which takes an ole Eclipsegridparser instance.	2014-03-25 18:57:58 +01:00
sim_2p_incomp.cpp	Removed WellsManager constructor which takes an ole Eclipsegridparser instance.	2014-03-25 18:57:58 +01:00
wells_example.cpp	Removed WellsManager constructor which takes an ole Eclipsegridparser instance.	2014-03-25 18:57:58 +01:00