resolved a merge conflict
No related branches found
No related tags found
Showing
- cmake/modules/CMakeLists.txt 4 additions, 3 deletionscmake/modules/CMakeLists.txt
- cmake/modules/CXXFeatures.cmake 13 additions, 0 deletionscmake/modules/CXXFeatures.cmake
- cmake/modules/DuneMultimeshMacros.cmake 2 additions, 0 deletionscmake/modules/DuneMultimeshMacros.cmake
- config.h.cmake 3 additions, 0 deletionsconfig.h.cmake
- dune/multimesh/mmentity.hh 10 additions, 13 deletionsdune/multimesh/mmentity.hh
- dune/multimesh/mmgeometry.hh 7 additions, 7 deletionsdune/multimesh/mmgeometry.hh
- dune/multimesh/mmiterator.hh 114 additions, 34 deletionsdune/multimesh/mmiterator.hh
- dune/multimesh/multigridview.hh 208 additions, 0 deletionsdune/multimesh/multigridview.hh
- dune/multimesh/multiindexset.hh 113 additions, 0 deletionsdune/multimesh/multiindexset.hh
- dune/multimesh/multimesh.hh 6 additions, 6 deletionsdune/multimesh/multimesh.hh
- dune/multimesh/utility/structuredgridbuilder.hh 6 additions, 10 deletionsdune/multimesh/utility/structuredgridbuilder.hh
- src/CMakeLists.txt 2 additions, 0 deletionssrc/CMakeLists.txt
- src/localrefinement.cc 2 additions, 2 deletionssrc/localrefinement.cc
- src/multigridview.cc 75 additions, 0 deletionssrc/multigridview.cc
- src/testiterator.cc 2 additions, 2 deletionssrc/testiterator.cc
- src/uggrid.cc 2 additions, 1 deletionsrc/uggrid.cc
- test/CMakeLists.txt 2 additions, 1 deletiontest/CMakeLists.txt
- test/testgridviews.cc 53 additions, 0 deletionstest/testgridviews.cc
- test/testvolume.cc 1 addition, 1 deletiontest/testvolume.cc
Loading
Please register or sign in to comment