Skip to content
Commit 2aab513e authored by Xiaoyu Wei's avatar Xiaoyu Wei
Browse files

Merge branch 'master' into 'update-miscs'

# Conflicts:
#   contrib/meshgen11_dealii/meshgen.cpp
#   examples/volume_potential_2d.py
#   examples/volume_potential_3d.py
#   test/test_singular_integral_2d.py
parents 8d0e6b67 15d7c6c7
Loading
Loading
Loading
Loading
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment