Merge branch 'master' into refactor-walker-functors
# Conflicts: # dune/xt/grid/exceptions.hh # dune/xt/grid/test/builder_definitions.cmake # dune/xt/grid/test/compiles_totals.pickle # dune/xt/grid/test/walker.cc # dune/xt/grid/walker.hh # dune/xt/grid/walker/apply-on.hh
No related branches found
No related tags found
Showing
- .clang-format 1 addition, 1 deletion.clang-format
- .cmake_format.py 1 addition, 0 deletions.cmake_format.py
- .gitattributes 2 additions, 0 deletions.gitattributes
- .gitignore 2 additions, 0 deletions.gitignore
- .gitsuper 112 additions, 0 deletions.gitsuper
- .mailmap 2 additions, 0 deletions.mailmap
- .pylicense-cpp.cfg 6 additions, 5 deletions.pylicense-cpp.cfg
- .pylicense-other.cfg 10 additions, 6 deletions.pylicense-other.cfg
- .travis.after_script.bash 9 additions, 0 deletions.travis.after_script.bash
- .travis.cfg.in 2 additions, 0 deletions.travis.cfg.in
- .travis.ctest 2 additions, 0 deletions.travis.ctest
- .travis.make_env_file.py 9 additions, 0 deletions.travis.make_env_file.py
- .travis.script.bash 10 additions, 0 deletions.travis.script.bash
- .travis.test_python.bash 9 additions, 0 deletions.travis.test_python.bash
- .travis.yml 8 additions, 15 deletions.travis.yml
- .vcsetup 1 addition, 1 deletion.vcsetup
- CMakeLists.txt 15 additions, 20 deletionsCMakeLists.txt
- LICENSE 2 additions, 0 deletionsLICENSE
- cmake/modules/CMakeLists.txt 9 additions, 3 deletionscmake/modules/CMakeLists.txt
- cmake/modules/DuneXtGridMacros.cmake 2 additions, 0 deletionscmake/modules/DuneXtGridMacros.cmake
Loading
Please register or sign in to comment