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
..
initState_impl.hpp	Fix stride bug in SGAS/SWAT init.	2012-09-04 13:06:13 +02:00
initState.hpp	Added initBlackoilSurfvol() function.	2012-05-21 14:03:56 +02:00
miscUtilities.cpp	Fix stride bug in WellReport::push(). Use convert::to().	2012-09-04 13:12:06 +02:00
miscUtilities.hpp	Fixed comment.	2012-09-03 12:26:22 +02:00
miscUtilitiesBlackoil.cpp	Switch loop ordering for better cache performance.	2012-08-27 13:17:27 +02:00
miscUtilitiesBlackoil.hpp	Whitespace cleanup.	2012-08-23 08:59:09 +02:00
writeVtkData.hpp	Using Datamapper.h in writeVtkData	2012-06-28 13:20:18 +02:00