This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch debian
in repository osmpbf.
commit c91c50960e2250dd84fc1b57b5f446032a3f49c7
Merge: 3666b67 47e4978
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Tue Mar 11 21:32:07 2014 +0100
Merge tag 'upstream/1.3.1' into debian
Upstream version 1.3.1
Conflicts:
debian/changelog
debian/compat
debian/control
debian/copyright
debian/rules
debian/source/format
CMakeLists.txt | 15 ++++
README | 2 +
ReleaseNotes.txt | 7 ++
debian/docs | 3 +
debian/libosmpbf-dev.manpages | 1 +
include/osmpbf/osmpbf.h | 9 ++-
pom.xml | 4 +-
resources/sample.pbf | Bin 0 -> 9653 bytes
src.java/crosby/binary/test/ReadFileExample.java | 86 +++++++++++++++++++++++
src/CMakeLists.txt | 19 +++++
src/Makefile | 23 +++---
tools/CMakeLists.txt | 32 +++++++++
tools/Makefile | 14 ++--
tools/osmpbf-outline.cpp | 15 +++-
14 files changed, 206 insertions(+), 24 deletions(-)
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/osmpbf.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
