[routino] 02/13: Merge tag 'upstream/3.0'
Sebastiaan Couwenberg
sebastic at moszumanska.debian.org
Sun Sep 13 22:33:07 UTC 2015
This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch master
in repository routino.
commit 8dfcb546a08058d79626fef166a869aeaf3209a7
Merge: 83cbd69 b43cac7
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Sun Sep 13 10:47:05 2015 +0200
Merge tag 'upstream/3.0'
Upstream version 3.0
ChangeLog | 2452 ++++++++++++++------
Makefile | 5 +-
Makefile.conf | 58 +-
doc/INSTALL-MS-WIN.txt | 151 ++
doc/INSTALL.txt | 9 +-
doc/LIBRARY.txt | 683 ++++++
doc/NEWS.txt | 44 +-
doc/OUTPUT.txt | 7 +-
doc/README.txt | 5 +-
doc/TAGGING.txt | 4 +-
doc/USAGE.txt | 26 +-
doc/html/algorithm.html | 5 +-
doc/html/configuration.html | 5 +-
doc/html/data.html | 5 +-
doc/html/index.html | 22 +-
doc/html/installation-ms-windows.html | 247 ++
doc/html/installation.html | 13 +-
doc/html/library.html | 967 ++++++++
doc/html/limits.html | 5 +-
doc/html/output.html | 5 +-
doc/html/readme.html | 169 +-
doc/html/style.css | 46 +-
doc/html/tagging.html | 24 +-
doc/html/usage.html | 25 +-
extras/find-fixme/Makefile | 50 +-
extras/find-fixme/README.txt | 10 +-
extras/find-fixme/fixme-dumper.c | 62 +-
extras/find-fixme/fixme-finder.c | 85 +-
extras/find-fixme/osmparser.c | 20 +-
extras/find-fixme/web/www/index.html | 5 +-
extras/tagmodifier/Makefile | 18 +-
extras/tagmodifier/README.txt | 11 +-
extras/tagmodifier/tagmodifier.c | 105 +-
src/Makefile | 187 +-
src/cache.h | 15 +-
src/errorlog.h | 16 +-
src/errorlogx.c | 38 +-
src/fakes.c | 29 +-
src/fakes.h | 4 +-
src/filedumper.c | 138 +-
src/filedumperx.c | 55 +-
src/files.c | 326 ++-
src/files.h | 56 +-
src/functions.h | 23 +-
src/logerror.c | 12 +-
src/logging.c | 32 +-
src/logging.h | 3 +-
src/mman-win32.c | 206 ++
src/mman-win32.h | 77 +
src/nodes.c | 12 +-
src/nodes.h | 10 +-
src/nodesx.c | 42 +-
src/nodesx.h | 6 +-
src/optimiser.c | 836 +++----
src/osmo5mparse.c | 15 +-
src/osmparser.c | 28 +-
src/osmpbfparse.c | 19 +-
src/osmxmlparse.c | 88 +-
src/output.c | 593 +++--
src/planetsplitter.c | 113 +-
src/profiles.c | 318 ++-
src/profiles.h | 27 +-
src/relations.c | 6 +-
src/relations.h | 10 +-
src/relationsx.c | 63 +-
src/relationsx.h | 6 +-
src/results.c | 14 +-
src/router+lib.c | 599 +++++
src/router.c | 507 ++--
src/routino.c | 728 ++++++
src/routino.h | 286 +++
src/segments.c | 6 +-
src/segments.h | 12 +-
src/segmentsx.c | 44 +-
src/segmentsx.h | 6 +-
src/sorting.c | 52 +-
src/superx.c | 6 +-
src/tagging.c | 76 +-
src/test/Makefile | 66 +-
src/test/a-b-c-d.sh | 27 +-
src/test/a-b-c.sh | 27 +-
src/test/a-b.sh | 27 +-
src/test/copyright.xml | 4 +-
src/test/cycle-drive.sh | 35 +-
src/test/only-split.sh | 15 +-
src/test/run-tests.sh | 101 +
src/test/start-1-finish.sh | 27 +-
src/translations.c | 796 +++++--
src/translations.h | 98 +-
src/types.c | 8 +-
src/typesx.h | 2 +-
src/uncompress.c | 31 +-
src/version.h | 30 +
src/visualiser.c | 9 +-
src/ways.c | 8 +-
src/ways.h | 12 +-
src/waysx.c | 52 +-
src/waysx.h | 18 +-
src/xml/Makefile | 34 +-
src/xml/xsd-to-xmlparser.c | 40 +-
src/xmlparse.c | 178 +-
src/xmlparse.h | 27 +-
web/Makefile | 105 +-
web/translations/router.html | 52 +-
web/translations/translate.pl | 15 +-
web/translations/translation.de.txt | 57 +-
web/translations/translation.en.txt | 21 +-
web/translations/translation.fr.txt | 21 +-
web/translations/translation.hu.txt | 271 +++
web/translations/translation.nl.txt | 47 +-
web/translations/translation.pl.txt | 217 ++
web/translations/translation.ru.txt | 17 +-
web/translations/translations-body.xml | 15 +-
web/translations/translations-head.xml | 2 +-
web/www/leaflet/install.sh | 2 +-
web/www/routino/.htaccess | 10 +
web/www/routino/icons/limit-2.6.png | Bin 747 -> 745 bytes
web/www/routino/icons/limit-2.8.png | Bin 747 -> 744 bytes
web/www/routino/icons/limit-20.6.png | Bin 860 -> 858 bytes
web/www/routino/icons/limit-20.8.png | Bin 870 -> 867 bytes
web/www/routino/icons/limit-21.6.png | Bin 833 -> 832 bytes
web/www/routino/icons/limit-21.8.png | Bin 841 -> 840 bytes
web/www/routino/icons/limit-22.6.png | Bin 860 -> 857 bytes
web/www/routino/icons/limit-22.8.png | Bin 866 -> 864 bytes
web/www/routino/icons/limit-23.6.png | Bin 859 -> 858 bytes
web/www/routino/icons/limit-23.8.png | Bin 859 -> 857 bytes
web/www/routino/icons/limit-24.6.png | Bin 814 -> 814 bytes
web/www/routino/icons/limit-24.8.png | Bin 820 -> 820 bytes
web/www/routino/icons/limit-25.5.png | Bin 848 -> 847 bytes
web/www/routino/icons/limit-25.6.png | Bin 867 -> 865 bytes
web/www/routino/icons/limit-25.8.png | Bin 864 -> 864 bytes
web/www/routino/icons/limit-26.4.png | Bin 810 -> 810 bytes
web/www/routino/icons/limit-26.6.png | Bin 852 -> 849 bytes
web/www/routino/icons/limit-26.8.png | Bin 855 -> 851 bytes
web/www/routino/icons/limit-26.png | Bin 738 -> 737 bytes
web/www/routino/icons/limit-27.6.png | Bin 851 -> 849 bytes
web/www/routino/icons/limit-27.8.png | Bin 836 -> 835 bytes
web/www/routino/icons/limit-28.4.png | Bin 822 -> 823 bytes
web/www/routino/icons/limit-28.6.png | Bin 862 -> 859 bytes
web/www/routino/icons/limit-28.8.png | Bin 845 -> 844 bytes
web/www/routino/icons/limit-28.png | Bin 728 -> 728 bytes
web/www/routino/icons/limit-29.6.png | Bin 855 -> 853 bytes
web/www/routino/icons/limit-29.8.png | Bin 859 -> 858 bytes
web/www/routino/index.html | 5 +-
web/www/routino/profiles.js | 76 +
web/www/routino/profiles.pl | 78 +
web/www/routino/router.css | 44 +-
web/www/routino/router.html.de | 60 +-
web/www/routino/router.html.en | 42 +-
web/www/routino/router.html.fr | 42 +-
web/www/routino/router.html.hu | 496 ++++
web/www/routino/router.html.nl | 50 +-
web/www/routino/{router.html.en => router.html.pl} | 202 +-
web/www/routino/router.html.ru | 42 +-
web/www/routino/router.leaflet.js | 256 +-
web/www/routino/router.openlayers.js | 257 +-
web/www/routino/visualiser.html.de | 28 +-
web/www/routino/visualiser.html.en | 6 +
web/www/routino/visualiser.html.fr | 6 +
.../{visualiser.html.nl => visualiser.html.hu} | 210 +-
web/www/routino/visualiser.html.nl | 24 +-
.../{visualiser.html.en => visualiser.html.pl} | 110 +-
web/www/routino/visualiser.html.ru | 6 +
xml/Makefile | 4 +-
xml/routino-tagging.xml | 10 +-
xml/routino-translations.xml | 277 ++-
xml/routino-translations.xsd | 14 +-
167 files changed, 12129 insertions(+), 3833 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/routino.git
More information about the Pkg-grass-devel
mailing list