This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository osmctools.
commit 1ab2ea729266d5deaab210f8bf2d405eb7634234
Merge: a9f68ae 0bbb3b0
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Sat Oct 25 19:49:34 2014 +0200
Merge tag 'upstream/0.2'
Upstream version 0.2
Conflicts:
.gitignore
.gitignore | 7 +++++++
src/osmconvert.c | 46 ++++++++++++++++++++++++++--------------------
src/osmfilter.c | 10 ++++++----
3 files changed, 39 insertions(+), 24 deletions(-)
diff --cc .gitignore
index 845ca06,925c2dc..0046e2a
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,7 +1,8 @@@
+.pc
+ *.in
+ aclocal.m4
+ autom4te.cache/
+ configure
+ depcomp
+ install-sh
+ missing
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/osmctools.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
