summaryrefslogtreecommitdiff
path: root/merged-branches.txt
diff options
context:
space:
mode:
authorVolker Lendecke <vl@samba.org>2012-07-13 10:22:05 +0200
committerJeremy Allison <jra@samba.org>2012-07-18 15:47:27 -0700
commit3882113e6f44d0adbc321d97931a6e9a37a149b8 (patch)
treedbb5b8550b658f6d64f7918e3afadb7514fa9c92 /merged-branches.txt
parentdc5e3fba488fc99dcd984e37d6f05ac22a773b47 (diff)
downloadsamba-3882113e6f44d0adbc321d97931a6e9a37a149b8.tar.gz
samba-3882113e6f44d0adbc321d97931a6e9a37a149b8.tar.bz2
samba-3882113e6f44d0adbc321d97931a6e9a37a149b8.zip
s3: Fix the build
Signed-off-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'merged-branches.txt')
0 files changed, 0 insertions, 0 deletions