summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-09 20:38:07 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-09 20:38:07 +0100
commit0af38050dda392c42fd6b2d7982c94663b6286e0 (patch)
tree59c56cd663ee3dc03d0ce63bf4405ee87c14834a /source4
parentec106a14216ee034b7e04c177c89703e63dfd107 (diff)
parent1342b265caa91bcd12ce608e3821c4e355ce1577 (diff)
downloadsamba-0af38050dda392c42fd6b2d7982c94663b6286e0.tar.gz
samba-0af38050dda392c42fd6b2d7982c94663b6286e0.tar.bz2
samba-0af38050dda392c42fd6b2d7982c94663b6286e0.zip
Merge branch 'v4-0-trivial' into v4-0-python
Conflicts: source/scripting/python/config.m4 (This used to be commit 6a43b5e895444235c869b008de98e4b21bcdcfd9)
Diffstat (limited to 'source4')
0 files changed, 0 insertions, 0 deletions