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

sebastic pushed a commit to branch master
in repository libcitygml.

commit fe84722fab7a45b2543a440307746bc8f3a44df7
Merge: 83794c9 9e30b17
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Mon Aug 31 00:21:55 2015 +0200

    Merge tag 'upstream/2.0'
    
    Upstream version 2.0

 CMakeLists.txt                                    | 28 ++++++++++++++++++++---
 osgplugin/ReaderWriterCityGML.cpp                 |  6 ++---
 sources/CMakeLists.txt                            | 16 +++++++++----
 sources/citygml.pc.cmake                          | 11 +++++++++
 sources/include/citygml/appearancetarget.h        |  8 +++----
 sources/include/citygml/geometry.h                |  8 +++----
 sources/include/citygml/polygon.h                 |  8 +++----
 sources/include/citygml/texturetargetdefinition.h | 12 +++++-----
 sources/include/parser/elementparser.h            |  2 ++
 sources/include/parser/geocoordinatetransformer.h |  5 ++--
 sources/include/parser/textureelementparser.h     |  2 +-
 sources/src/citygml/appearancetarget.cpp          | 16 ++++++-------
 sources/src/citygml/geometry.cpp                  | 18 +++++++--------
 sources/src/citygml/linearring.cpp                |  8 +++----
 sources/src/citygml/polygon.cpp                   | 26 ++++++++++-----------
 sources/src/citygml/texturetargetdefinition.cpp   | 16 ++++++-------
 sources/src/parser/addressparser.cpp              |  8 +++----
 sources/src/parser/geocoordinatetransformer.cpp   | 26 ++++++++++-----------
 sources/src/parser/geometryelementparser.cpp      |  2 +-
 sources/src/parser/gmlfeaturecollectionparser.cpp |  2 +-
 sources/src/parser/textureelementparser.cpp       |  3 +--
 test/CMakeLists.txt                               |  3 +++
 test/citygmltest.cpp                              |  2 +-
 23 files changed, 140 insertions(+), 96 deletions(-)

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

_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel

Reply via email to