[osm2pgsql] 02/05: Merge tag 'upstream/0.87.1'

[Bas Couwenberg]

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

sebastic-guest pushed a commit to branch master
in repository osm2pgsql.

commit 19e54042982889cac21082c9378b2af8c5332466
Merge: db21b00 2808848
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Tue Dec 30 08:38:31 2014 +0100

    Merge tag 'upstream/0.87.1'
    
    Upstream version 0.87.1

 Makefile.am                                   |   4 -
 README.md                                     |   4 +-
 binarysearcharray.cpp                         | 118 ------
 binarysearcharray.hpp                         |  22 -
 building.lua                                  | 124 ++++++
 configure.ac                                  |   2 +-
 docs/multi.md                                 |  55 +++
 geometry-processor.cpp                        |   4 +-
 keyvals.cpp                                   | 240 +++--------
 keyvals.hpp                                   |  70 +--
 middle-pgsql.cpp                              |  56 ++-
 middle-pgsql.hpp                              |   1 -
 middle-ram.cpp                                |  25 +-
 middle-ram.hpp                                |   1 -
 middle.hpp                                    |   1 -
 node-persistent-cache-reader.cpp              |   1 -
 node-persistent-cache.cpp                     |  52 ++-
 node-persistent-cache.hpp                     |  32 +-
 options.cpp                                   |   6 +-
 osm2pgsql.cpp                                 |   1 -
 output-gazetteer.cpp                          | 590 +++++++++++++-------------
 output-gazetteer.hpp                          |   2 +-
 output-multi.cpp                              |  16 +-
 output-pgsql.cpp                              |  18 +-
 parse-o5m.cpp                                 |  16 +-
 parse-pbf.cpp                                 |  34 +-
 parse-xml2.cpp                                |  20 +-
 pgsql.cpp                                     |   8 +-
 sample.multi.json                             |  16 +
 table.cpp                                     |  21 +-
 taginfo.cpp                                   |   4 +-
 tagtransform.cpp                              | 364 +++++++---------
 tests/middle-tests.cpp                        |  13 +-
 tests/test-output-multi-line.cpp              |  40 +-
 tests/test-output-multi-point-multi-table.cpp |  11 +-
 tests/test-output-multi-point.cpp             |  11 +-
 tests/test-output-multi-polygon.cpp           |  41 +-
 tests/test-output-pgsql.cpp                   |   1 -
 tests/test-parse-xml2.cpp                     |   1 -
 tests/test-pgsql-escape.cpp                   |  18 +-
 text-tree.cpp                                 | 101 -----
 text-tree.hpp                                 |  21 -
 42 files changed, 974 insertions(+), 1212 deletions(-)

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