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

[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 5ff97f9a64e236f78a24fd922d12b2b20817cce7
Merge: 0c9fa58 08f9bc0
Author: Sven Geggus <sven-deb at geggus.net>
Date:   Fri Sep 18 17:46:46 2015 +0200

    Merge tag 'upstream/1.2.0'
    
    Upstream version 1.2.0

 .gitignore                                         |  12 +-
 .travis.yml                                        |  19 +++
 CMakeLists.txt                                     |   9 +-
 NEWS                                               |  16 ++-
 src/Exception.h                                    |   2 +-
 src/algorithm/connection.cpp                       |   2 +-
 src/algorithm/covers.h                             |   2 +-
 src/algorithm/difference.h                         |   2 +-
 src/algorithm/intersection.h                       |   2 +-
 src/algorithm/intersects.h                         |   2 +-
 src/algorithm/isValid.cpp                          |  12 ++
 src/algorithm/straightSkeleton.cpp                 | 135 +++++++++++++++------
 src/algorithm/straightSkeleton.h                   |  16 ++-
 src/algorithm/translate.cpp                        |  12 ++
 src/algorithm/translate.h                          |   7 +-
 src/algorithm/union.cpp                            |   4 +-
 src/algorithm/union.h                              |   2 +-
 src/capi/sfcgal_c.cpp                              |   1 +
 src/capi/sfcgal_c.h                                |  10 +-
 src/detail/GeometrySet.cpp                         |   4 +-
 src/detail/TestGeometry.h                          |   2 +
 src/detail/graph/Edge.h                            |   2 +-
 src/detail/graph/GeometryGraph.h                   |   2 +-
 test/CMakeLists.txt                                |   8 --
 test/bench/BenchStraightSkeleton.cpp               |  95 +++++++++++++++
 ...tSkeletonTest.cpp => ApproximateMedialAxis.cpp} |  60 +++++----
 .../unit/SFCGAL/algorithm/StraightSkeletonTest.cpp |  54 +++++++--
 test/unit/SFCGAL/capi/sfcgal_cTest.cpp             |  28 +++++
 travis/linux/before_install.sh                     |  16 +++
 viewer/src/SFCGAL/viewer/plugins/DataPlugin.cpp    |   2 +-
 30 files changed, 422 insertions(+), 118 deletions(-)

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