[mshr] 02/03: Merge tag 'upstream/2017.1.0' into experimental

[Johannes Ring]

This is an automated email from the git hooks/post-receive script.

johannr-guest pushed a commit to branch experimental
in repository mshr.

commit 01545ff93f407bf9bb76dffa4eba8ced9774a180
Merge: 26f52b1 8240543
Author: Johannes Ring <johannr at simula.no>
Date:   Thu May 11 13:00:41 2017 +0200

    Merge tag 'upstream/2017.1.0' into experimental
    
    Upstream version 2017.1.0

 .gitignore                     |   1 +
 CMakeLists.txt                 |   4 +-
 ChangeLog                      |  13 -----
 ChangeLog.rst                  |  32 ++++++++++++
 include/mshr/CSGCGALDomain2D.h |   4 +-
 include/mshr/CSGGeometry.h     |  19 +++++--
 include/mshr/CSGOperators.h    |  44 +++++++++++-----
 include/mshr/CSGPrimitives2D.h |  15 +++++-
 include/mshr/CSGPrimitives3D.h |   9 +++-
 release.conf                   |   2 +-
 src/CSGCGALDomain2D.cpp        |  72 ++++++++++++++------------
 src/CSGCGALDomain3D.cpp        |   8 ++-
 src/CSGCGALMeshGenerator2D.cpp |  14 +++--
 src/CSGGeometry.cpp            |  62 ++++++++++++++++++++--
 src/CSGOperators.cpp           | 115 ++++++++++++++++++++++++++++++++++++++++-
 src/CSGPrimitives2D.cpp        |  82 +++++++++++++++++++++++++++--
 src/CSGPrimitives3D.cpp        |  14 ++++-
 src/MeshGenerator.cpp          |  30 +++--------
 swig/CMakeLists.txt            |   9 ++--
 test/CMakeLists.txt            |  10 ++++
 test/test-csg-predicates.py    |  34 ++++++++++++
 test/test-num-segments-2d.py   |  13 +++++
 22 files changed, 491 insertions(+), 115 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/fenics/mshr.git