[sfcgal] 03/04: Merge tag 'upstream/1.2.1'

[Sven Geggus]

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

giggls-guest pushed a commit to branch master
in repository sfcgal.

commit 5e97c83f75b2e4f87f0a9761b02883563890460e
Merge: 07dcf3a dcc15a0
Author: Sven Geggus <sven-deb at geggus.net>
Date:   Tue Nov 10 19:18:01 2015 +0100

    Merge tag 'upstream/1.2.1'
    
    Upstream version 1.2.1

 .gitignore                                         | 11 +++
 .travis.yml                                        | 10 ++-
 cmake/Modules/FindCGAL.cmake                       |  3 +-
 src/algorithm/Intersection3D.cpp                   | 12 ++-
 src/algorithm/difference.cpp                       |  1 -
 src/algorithm/differencePrimitives.h               |  8 +-
 src/algorithm/intersects.cpp                       |  4 +-
 src/algorithm/minkowskiSum.cpp                     |  8 ++
 src/algorithm/straightSkeleton.cpp                 |  4 +-
 src/algorithm/union.cpp                            |  4 +-
 src/detail/Point_inside_polyhedron.h               | 19 +++++
 test/CMakeLists.txt                                |  2 +
 .../StraightSkeletonTest.txt                       |  0
 test/data/StraightSkeletonTest/issue111.txt        |  3 +
 test/garden/CMakeLists.txt                         |  4 +-
 test/regress/standalone/CMakeLists.txt             |  4 +-
 test/regress/standalone/README                     | 15 ++++
 .../standalone/SFCGAL/StraightSkeletonTest.cpp     | 97 +++++++++++++++++-----
 test/unit/CMakeLists.txt                           |  4 +-
 travis/linux/before_install.sh                     | 16 +++-
 travis/linux/install_cgal.sh                       | 14 ++++
 21 files changed, 193 insertions(+), 50 deletions(-)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/sfcgal.git