]> git.michaelhowe.org Git - packages/b/bup.git/commitdiff
projects / packages / b / bup.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d7220ae 7e9005e)
Merge branch 'master' into debian
authorRobert S. Edmonds <edmonds@debian.org>
Mon, 4 Mar 2013 00:42:35 +0000 (19:42 -0500)
committerRobert S. Edmonds <edmonds@debian.org>
Mon, 4 Mar 2013 00:42:35 +0000 (19:42 -0500)
1  2 
Makefile patch | diff1 | diff2 | blob | history
config/configure patch | diff1 | diff2 | blob | history
config/configure.inc patch | diff1 | diff2 | blob | history
lib/bup/_helpers.c patch | diff1 | diff2 | blob | history
lib/bup/git.py patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge
diff --cc config/configure
Simple merge
diff --cc config/configure.inc
Simple merge
diff --cc lib/bup/_helpers.c
Simple merge
diff --cc lib/bup/git.py
Simple merge