[routino] 02/13: Merge tag 'upstream/2.4.1'

[Uwe Steinmann]

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

steinm-guest pushed a commit to branch master
in repository routino.

commit 5e9d3fa66a0b527fa66f1d81ed1f93ae78c959c3
Merge: fed661f fc6d7dd
Author: Uwe Steinmann <steinm at debian.org>
Date:   Fri Dec 21 21:34:27 2012 +0100

    Merge tag 'upstream/2.4.1'
    
    Upstream version 2.4.1

 ChangeLog                                          |  619 ++++++++++++
 doc/ALGORITHM.txt                                  |   25 +-
 doc/DATALIFE.txt                                   |   88 ++
 doc/NEWS.txt                                       |   50 +
 doc/README.txt                                     |    2 +
 doc/TAGGING.txt                                    |   25 +-
 doc/USAGE.txt                                      |  132 ++-
 doc/html/algorithm.html                            |   24 +-
 doc/html/readme.html                               |  113 +--
 doc/html/tagging.html                              |   34 +-
 doc/html/usage.html                                |  126 ++-
 src/Makefile                                       |   10 +-
 src/fakes.c                                        |   42 +-
 src/fakes.h                                        |    6 +-
 src/filedumper.c                                   |  231 +++--
 src/filedumperx.c                                  |  397 ++++++++
 src/files.c                                        |   32 +-
 src/files.h                                        |   19 +-
 src/logging.c                                      |   28 +-
 src/logging.h                                      |    7 +
 src/nodes.c                                        |   70 +-
 src/nodes.h                                        |    2 +-
 src/nodesx.c                                       |  572 ++++++-----
 src/nodesx.h                                       |   30 +-
 src/optimiser.c                                    |  244 +++--
 src/osmparser.c                                    |  342 ++++++-
 src/osmparser.h                                    |    4 +-
 src/output.c                                       |   86 +-
 src/planetsplitter.c                               |  164 +--
 src/profiles.c                                     |   40 +-
 src/profiles.h                                     |    4 +-
 src/prunex.c                                       |  446 +++++----
 src/relationsx.c                                   |  636 +++++++-----
 src/relationsx.h                                   |   44 +-
 src/results.c                                      |    5 +-
 src/router.c                                       |    8 +-
 src/segments.c                                     |   62 +-
 src/segments.h                                     |   52 +-
 src/segmentsx.c                                    | 1040 ++++++++++++--------
 src/segmentsx.h                                    |   50 +-
 src/sorting.c                                      |  129 ++-
 src/sorting.h                                      |   20 +-
 src/superx.c                                       |   97 +-
 src/tagging.c                                      |   21 +-
 src/tagmodifier.c                                  |    8 +-
 src/translations.c                                 |    6 +-
 src/translations.h                                 |    4 +-
 src/types.c                                        |   81 +-
 src/types.h                                        |  114 ++-
 src/typesx.h                                       |   21 +-
 src/visualiser.c                                   |  124 +--
 src/ways.c                                         |   42 +-
 src/ways.h                                         |   17 +-
 src/waysx.c                                        |  609 +++++++-----
 src/waysx.h                                        |   34 +-
 .../{bad-cdata-start.xml => bad-text-outside.xml}  |    4 +-
 src/xml/test/good.xml                              |    1 -
 src/xmlparse.l                                     |   77 +-
 web/bin/summarise-log.pl                           |  216 +++-
 web/www/routino/customrouter.cgi                   |   48 -
 web/www/routino/customvisualiser.cgi               |   48 -
 web/www/routino/noscript.cgi                       |  197 ----
 web/www/routino/noscript.html                      |   70 --
 web/www/routino/noscript.template.html             |  438 ---------
 xml/{routino-osm.xsd => osc.xsd}                   |   74 +-
 xml/osm.xsd                                        |    7 +-
 xml/{routino-osm.xsd => routino-osc.xsd}           |   63 +-
 xml/routino-osm.xsd                                |    2 +-
 xml/routino-tagging.xml                            |  194 +++-
 69 files changed, 5305 insertions(+), 3372 deletions(-)

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