Skip to content
Snippets Groups Projects
Select Git revision
  • master default protected
  • 6.3.3
  • data-explorer-5
  • 6.3.2
  • 6.3.1
  • 6.3.0
  • 6.2.2
  • 6.2.1
  • 6.2.0
  • 6.2.0-rc1
  • 6.1.0
  • 6.1.0-rc1
  • 6.0.8-insitu
  • 6.0.8
  • 6.0.7
  • 6.0.6
  • tes-works-again
  • 6.0.5
  • ode-pre-review
  • 6.0.4
  • 6.0.3
21 results
Blame Permalink
Forked from ogs / ogs
24233 commits behind the upstream repository.
  • Lars Bilke's avatar
    c376a2ed
    Merge remote-tracking branch 'origin/master' into ReformatFileHeader · c376a2ed
    Lars Bilke authored 
    Conflicts:
	FileIO/GMSInterface.cpp
	FileIO/GMSInterface.h
	FileIO/Gmsh2GeoIO.cpp
	FileIO/Gmsh2GeoIO.h
	FileIO/Legacy/MeshIO.cpp
	FileIO/MeshIO/GMSHAdaptiveMeshDensity.cpp
	FileIO/MeshIO/GMSHInterface.cpp
	FileIO/PetrelInterface.cpp
	FileIO/PetrelInterface.h
	FileIO/RapidXmlIO/BoostVtuInterface.cpp
	FileIO/RapidXmlIO/zLibDataCompressor.cpp
	FileIO/RapidXmlIO/zLibDataCompressor.h
	FileIO/SHPInterface.cpp
	FileIO/SHPInterface.h
	FileIO/readMeshFromFile.cpp
	FileIO/readMeshFromFile.h
    c376a2ed
    History
    Merge remote-tracking branch 'origin/master' into ReformatFileHeader
    Lars Bilke authored 
    Conflicts:
	FileIO/GMSInterface.cpp
	FileIO/GMSInterface.h
	FileIO/Gmsh2GeoIO.cpp
	FileIO/Gmsh2GeoIO.h
	FileIO/Legacy/MeshIO.cpp
	FileIO/MeshIO/GMSHAdaptiveMeshDensity.cpp
	FileIO/MeshIO/GMSHInterface.cpp
	FileIO/PetrelInterface.cpp
	FileIO/PetrelInterface.h
	FileIO/RapidXmlIO/BoostVtuInterface.cpp
	FileIO/RapidXmlIO/zLibDataCompressor.cpp
	FileIO/RapidXmlIO/zLibDataCompressor.h
	FileIO/SHPInterface.cpp
	FileIO/SHPInterface.h
	FileIO/readMeshFromFile.cpp
	FileIO/readMeshFromFile.h
Code owners
Assign users and groups as approvers for specific file changes. Learn more.
readMeshFromFile.h 673 B