From: Robert S. Edmonds <edmonds@debian.org>
Date: Wed, 28 May 2014 22:56:00 +0000 (-0400)
Subject: Merge tag '0.26-rc1' into debian
X-Git-Url: https://git.michaelhowe.org/gitweb/?a=commitdiff_plain;h=af535e749e1e9ad73800dadfbb2fe249b9df0393;p=packages%2Fb%2Fbup.git

Merge tag '0.26-rc1' into debian

0.26-rc1

Conflicts:
	Makefile
---

af535e749e1e9ad73800dadfbb2fe249b9df0393
diff --cc Makefile
index de676a6,8989838..e1db41d
--- a/Makefile
+++ b/Makefile
@@@ -1,5 -1,5 +1,5 @@@
  OS:=$(shell uname | sed 's/[-_].*//')
- CFLAGS := -Wall -O2 $(PYINCLUDE) $(CFLAGS)
 -CFLAGS := -Wall -O2 -Werror -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
++CFLAGS := -Wall -O2 -Wno-unknown-pragmas $(PYINCLUDE) $(CFLAGS)
  SOEXT:=.so
  
  ifeq ($(OS),CYGWIN)