[osmpbf] 15/22: merged

[Bas Couwenberg]

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

sebastic-guest pushed a commit to tag v1.3.1
in repository osmpbf.

commit 538425c9549c4ef0f3bf32910f1e9baa2d69e657
Merge: 1bcf58a 2cd0806
Author: Scott Crosby <scrosby at cs.rice.edu>
Date:   Mon Sep 2 11:51:59 2013 -0500

    merged

 include/osmpbf/osmpbf.h | 5 ++---
 src/Makefile            | 3 ++-
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --cc src/Makefile
index ffb5464,a735f45..af00d80
--- a/src/Makefile
+++ b/src/Makefile
@@@ -1,6 -1,6 +1,7 @@@
  
 -CXXFLAGS += -O3 -fPIC
 +CXX ?= g++
- CXXFLAGS ?= -O3
++CXXFLAGS ?= -O3 -fPIC
+ 
  AR = ar
  
  all: libosmpbf.a ../include/osmpbf/fileformat.pb.h ../include/osmpbf/osmformat.pb.h

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