]> 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: ad14ae2 81ad1e6)
Merge tag '0.25-rc3' into debian
authorRobert S. Edmonds <edmonds@debian.org>
Tue, 24 Sep 2013 23:04:29 +0000 (19:04 -0400)
committerRobert S. Edmonds <edmonds@debian.org>
Tue, 24 Sep 2013 23:04:29 +0000 (19:04 -0400)
0.25-rc3

Conflicts:
cmd/fuse-cmd.py
cmd/web-cmd.py
config/configure
config/configure.inc

1  2 
Makefile patch | diff1 | diff2 | blob | history

diff --cc Makefile
Simple merge