OilfieldToolsNet/opm-core
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity
Files
8668ce7b71f5ffd8efc90e521602bb717bc39302
opm-core/opm/core/io
History
Markus Blatt 8668ce7b71 Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support 
Manually resolved conflicts:
	opm/core/io/eclipse/EclipseWriter.cpp
	opm/core/io/eclipse/EclipseWriter.hpp
	opm/core/props/BlackoilPropertiesFromDeck.cpp
	opm/core/simulator/initState_impl.hpp
	opm/core/wells/WellsManager.cpp
	opm/core/wells/WellsManager.hpp
2014-03-27 15:27:11 +01:00
..
eclipse
Merge remote-tracking branch 'upstream/master' into master-refactor-for-cpgrid-support
2014-03-27 15:27:11 +01:00
vag
Remove trailing whitespaces
2013-07-28 08:34:13 -03:00
vtk
convert users of the ASSERT and the ASSERT2 macros to standard assert()
2013-09-05 13:04:37 +02:00
OutputWriter.cpp
EclipseWriter: work around a GCC 4.4 smart_ptr bug
2014-03-20 16:58:57 +01:00
OutputWriter.hpp
EclipseWriter: work around a GCC 4.4 smart_ptr bug
2014-03-20 16:58:57 +01:00