Skip to content
Snippets Groups Projects
Commit aaa8a45d authored by David Hammer's avatar David Hammer
Browse files

Merge branch 'master' into 'pnccd-support'

# Conflicts:
#   setup.py
#   src/calng/base_geometry.py
#   src/calng/geometries/__init__.py
parents 8033df8a c838797b
No related branches found
No related tags found
No related merge requests found
Showing
with 697 additions and 213 deletions
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