From: Robert S. Edmonds <edmonds@debian.org>
Date: Thu, 8 Aug 2013 22:03:42 +0000 (-0400)
Subject: Merge branch 'master' into debian
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=22a8600f0ea8cddb07d00e253f4c37429cb09590;p=packages%2Fb%2Fbup.git

Merge branch 'master' into debian

Conflicts:
	Makefile
---

22a8600f0ea8cddb07d00e253f4c37429cb09590
diff --cc Makefile
index 0f18c43,216bf98..c542f97
--- a/Makefile
+++ b/Makefile
@@@ -1,5 -1,5 +1,5 @@@
  OS:=$(shell uname | sed 's/[-_].*//')
- CFLAGS:=-Wall -O2 $(PYINCLUDE)
 -CFLAGS := -Wall -O2 -Werror $(PYINCLUDE) $(CFLAGS)
++CFLAGS := -Wall -O2 $(PYINCLUDE) $(CFLAGS)
  SOEXT:=.so
  
  ifeq ($(OS),CYGWIN)