[osm2pgsql] 02/06: Merge tag 'upstream/0.90.1+ds'

[Bas Couwenberg]

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

sebastic pushed a commit to branch master
in repository osm2pgsql.

commit fc6dfa5017a9bad365d61ad4e868ec1aff3d5e32
Merge: 4175a43 beab47b
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sun Jul 17 13:30:46 2016 +0200

    Merge tag 'upstream/0.90.1+ds'
    
    Upstream version 0.90.1+ds

 CMakeLists.txt     |  2 +-
 TODO               | 18 ------------------
 default.style      |  1 -
 pgsql.cpp          |  2 +-
 processor-line.cpp |  7 ++++++-
 processor-line.hpp |  1 +
 reprojection.cpp   |  8 +++++---
 style.lua          |  2 +-
 table.cpp          |  2 +-
 9 files changed, 16 insertions(+), 27 deletions(-)

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