[libcitygml] 08/35: Merge tag 'upstream/1.3.0'

[Sebastiaan Couwenberg]

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

sebastic pushed a commit to branch master
in repository libcitygml.

commit 9188509318e0c2bd594695c68fc52880f0468d4a
Merge: 1bd3865 17e4451
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Fri Jul 24 16:29:27 2015 +0200

    Merge tag 'upstream/1.3.0'
    
    Upstream version 1.3.0

 CMakeLists.txt                                     |   4 +-
 SpecsToCheck.md                                    |  24 ++
 TODO.md                                            |  22 +-
 osgplugin/CitygmlOsgViewer.cpp                     |  86 ++++++-
 osgplugin/ReaderWriterCityGML.cpp                  |  46 ++--
 sources/CMakeLists.txt                             |  39 ++-
 sources/include/citygml/cityobject.h               |   7 +-
 sources/include/citygml/material.h                 |  10 +-
 sources/include/parser/appearanceelementparser.h   |   8 +-
 .../include/parser/delayedchoiceelementparser.h    |   2 +-
 sources/include/parser/elementparser.h             |  11 +-
 sources/include/parser/geometryelementparser.h     |   7 +-
 .../include/parser/gmlfeaturecollectionparser.h    |   9 +-
 ...featurecollectionparser.h => gmlobjectparser.h} |  16 +-
 .../include/parser/implicitgeometryelementparser.h |   7 +-
 sources/include/parser/linearringelementparser.h   |   7 +-
 sources/include/parser/materialelementparser.h     |   6 +-
 sources/include/parser/nodetypes.h                 | 120 ++++++++-
 sources/include/parser/polygonelementparser.h      |   7 +-
 sources/include/parser/sequenceparser.h            |  43 ++++
 sources/include/parser/skipelementparser.h         |  35 +++
 sources/include/parser/textureelementparser.h      |   7 +-
 sources/src/citygml/appearancemanager.cpp          |   2 +-
 sources/src/citygml/cityobject.cpp                 |   9 +-
 sources/src/citygml/material.cpp                   |  24 +-
 sources/src/parser/appearanceelementparser.cpp     |  17 +-
 sources/src/parser/cityobjectelementparser.cpp     | 146 +++++++++--
 sources/src/parser/geometryelementparser.cpp       |  57 +++--
 .../parser/georeferencedtextureelementparser.cpp   |  14 +-
 sources/src/parser/gmlfeaturecollectionparser.cpp  |  31 +--
 sources/src/parser/gmlobjectparser.cpp             |  50 ++++
 .../src/parser/implicitgeometryelementparser.cpp   |  26 +-
 sources/src/parser/linearringelementparser.cpp     |  11 +-
 sources/src/parser/materialelementparser.cpp       |  28 ++-
 sources/src/parser/nodetypes.cpp                   | 277 ++++++++++++++++++---
 sources/src/parser/polygonelementparser.cpp        |  28 ++-
 sources/src/parser/sequenceparser.cpp              |  55 ++++
 sources/src/parser/skipelementparser.cpp           |  56 +++++
 sources/src/parser/textureelementparser.cpp        |  21 +-
 39 files changed, 1150 insertions(+), 225 deletions(-)

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