[osm2pgsql] 02/04: Merge tag 'upstream/0.88.1'

Sat Aug 15 09:38:38 UTC 2015

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

sebastic pushed a commit to branch master
in repository osm2pgsql.

commit 9e8e1df9437db0f970044d58c1465110b2d38c6a
Merge: 0f86a6c ec75831
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Aug 15 11:03:34 2015 +0200

    Merge tag 'upstream/0.88.1'

    Upstream version 0.88.1

 configure.ac              |  2 +-
 docs/osm2pgsql.1          |  2 +-
 geometry-builder.cpp      |  2 +-
 id-tracker.cpp            |  2 ++
 id-tracker.hpp            |  1 +
 node-persistent-cache.cpp |  7 ++++---
 node-ram-cache.hpp        |  2 +-
 output-multi.cpp          | 36 ++++++++++++++++++++++++++----------
 output-pgsql.cpp          | 40 ++++++++++++++++++++++++++++------------
 table.cpp                 |  2 ++
 10 files changed, 67 insertions(+), 29 deletions(-)

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