git.samba.org / kai / samba-autobuild / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 93a3c5b b708005)
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
authorSimo Sorce <idra@samba.org>
Fri, 1 Feb 2008 19:24:31 +0000 (14:24 -0500)
committerSimo Sorce <idra@samba.org>
Fri, 1 Feb 2008 19:24:31 +0000 (14:24 -0500)
(This used to be commit 7dbfc7bdc65314466a83e8121b35c9bcb24b2631)

1  2 
source3/winbindd/winbindd_dual.c patch | diff1 | diff2 | blob | history
source3/winbindd/winbindd_util.c patch | diff1 | diff2 | blob | history

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