Skip to main content

Browse the archive

Revision 10d9cfd92c6d8f632edc3207f7d96d8816168360 authored by montoyav on 12 March 2021, 08:40:23 UTC, committed by montoyav on 12 March 2021, 08:40:23 UTC 
Merge branch 'master' into 'cherry-pick-54f2208a'
 
# Conflicts:
#   MaterialLib/MPL/PropertyType.h
2 parent s 9887f5d + 3765410
Raw File
.gitmodules 
[submodule "ThirdParty/container-maker"]
	path = ThirdParty/container-maker
	url = https://gitlab.opengeosys.org/ogs/container-maker.git
[submodule "ThirdParty/ogs6py"]
	path = ThirdParty/ogs6py
	url = https://github.com/joergbuchwald/ogs6py.git
back to top