git.samba.org / kai / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: deac176 ddc0d9d)
Merge branch 'v3-3-test' of ssh://git.samba.org/data/git/samba into v3-3-test
authorDerrell Lipman <derrell.lipman@unwireduniverse.com>
Wed, 16 Jul 2008 13:48:23 +0000 (09:48 -0400)
committerDerrell Lipman <derrell.lipman@unwireduniverse.com>
Wed, 16 Jul 2008 13:48:23 +0000 (09:48 -0400)
(This used to be commit 11d74fc51c637b8129304b5de85bbe02a86a69ce)

1  2 
source3/Makefile.in patch | diff1 | diff2 | blob | history
source3/libsmb/libsmb_context.c patch | diff1 | diff2 | blob | history

diff --cc source3/Makefile.in
Simple merge
diff --cc source3/libsmb/libsmb_context.c
Simple merge
Kai's WIP code