[osmpbf] 02/09: Merge tag 'upstream/1.3.2' into debian
Bas Couwenberg
sebastic at xs4all.nl
Wed Mar 12 21:30:20 UTC 2014
This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch debian
in repository osmpbf.
commit 9ec66a801d3d6cc74ebfaafa476d2817b3b709c8
Merge: 9d5f29b 51189c8
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date: Wed Mar 12 19:07:31 2014 +0100
Merge tag 'upstream/1.3.2' into debian
Upstream version 1.3.2
Conflicts:
debian/changelog
debian/control
.gitignore | 6 +++
README | 53 +++++++++++++++------
ReleaseNotes.txt | 8 ++++
build.xml | 2 +-
debian/.gitignore | 8 ++++
debian/control | 21 ++++----
include/osmpbf/osmpbf.h | 2 +-
pom.xml | 2 +-
src/Makefile | 16 ++++---
tools/Makefile | 13 +++--
tools/osmpbf-outline.cpp | 121 +++++++++++++++++++++++++++++------------------
11 files changed, 164 insertions(+), 88 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmpbf.git
More information about the Pkg-grass-devel
mailing list