Merge branch 'master' of github.com:ufz/ogs
Conflicts: MeshLib/Elements/Element.cpp MeshLib/Elements/Element.h
Showing
- Base/CMakeLists.txt 1 addition, 0 deletionsBase/CMakeLists.txt
- Base/README.md 11 additions, 0 deletionsBase/README.md
- Base/logog/CMakeLists.txt 55 additions, 0 deletionsBase/logog/CMakeLists.txt
- Base/logog/doc/make-doxygen.bat 2 additions, 0 deletionsBase/logog/doc/make-doxygen.bat
- Base/logog/doc/overview.dox 991 additions, 0 deletionsBase/logog/doc/overview.dox
- Base/logog/doxyfile 1716 additions, 0 deletionsBase/logog/doxyfile
- Base/logog/include/api.hpp 47 additions, 0 deletionsBase/logog/include/api.hpp
- Base/logog/include/checkpoint.hpp 31 additions, 0 deletionsBase/logog/include/checkpoint.hpp
- Base/logog/include/const.hpp 90 additions, 0 deletionsBase/logog/include/const.hpp
- Base/logog/include/formatter.hpp 89 additions, 0 deletionsBase/logog/include/formatter.hpp
- Base/logog/include/logog.hpp 36 additions, 0 deletionsBase/logog/include/logog.hpp
- Base/logog/include/macro.hpp 240 additions, 0 deletionsBase/logog/include/macro.hpp
- Base/logog/include/message.hpp 45 additions, 0 deletionsBase/logog/include/message.hpp
- Base/logog/include/mutex.hpp 98 additions, 0 deletionsBase/logog/include/mutex.hpp
- Base/logog/include/node.hpp 142 additions, 0 deletionsBase/logog/include/node.hpp
- Base/logog/include/object.hpp 221 additions, 0 deletionsBase/logog/include/object.hpp
- Base/logog/include/platform.hpp 180 additions, 0 deletionsBase/logog/include/platform.hpp
- Base/logog/include/socket.hpp 150 additions, 0 deletionsBase/logog/include/socket.hpp
- Base/logog/include/statics.hpp 74 additions, 0 deletionsBase/logog/include/statics.hpp
- Base/logog/include/string.hpp 115 additions, 0 deletionsBase/logog/include/string.hpp
Loading
Please register or sign in to comment