summaryrefslogtreecommitdiff
path: root/source4/Makefile
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-09-16 16:45:10 +0200
committerJelmer Vernooij <jelmer@samba.org>2008-09-16 16:45:10 +0200
commitbf21371c098684ccad427a54ac76766c0021bc88 (patch)
treeed1d0dce7dda8d41c6dcefdfe23eea35df1ced0c /source4/Makefile
parentf957aeaee64745148b815393b1fc1338104ed2e1 (diff)
parent0888ffa2b7382a1c4781ae54bad53eac3b229365 (diff)
downloadsamba-bf21371c098684ccad427a54ac76766c0021bc88.tar.gz
samba-bf21371c098684ccad427a54ac76766c0021bc88.tar.bz2
samba-bf21371c098684ccad427a54ac76766c0021bc88.zip
Merge branch 'singlereplace' into single
Conflicts: source4/configure.ac source4/torture/local/config.mk
Diffstat (limited to 'source4/Makefile')
0 files changed, 0 insertions, 0 deletions