git.samba.org / ira / wip.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 06f80cf 3d40b19)
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
authorJeremy Allison <jra@samba.org>
Sat, 5 Jan 2008 03:06:37 +0000 (19:06 -0800)
committerJeremy Allison <jra@samba.org>
Sat, 5 Jan 2008 03:06:37 +0000 (19:06 -0800)
(This used to be commit 3a45f62310faf63cd6864d2cb10f941492eda818)

1  2 
source3/client/client.c patch | diff1 | diff2 | blob | history

diff --cc source3/client/client.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.