git.samba.org / abartlet / samba.git / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a1de4e9 84fca38)
Merge branch 'v3-devel' of ssh://git.samba.org/data/git/samba into v3-devel
authorSimo Sorce <idra@samba.org>
Wed, 3 Sep 2008 15:52:54 +0000 (11:52 -0400)
committerSimo Sorce <idra@samba.org>
Wed, 3 Sep 2008 15:52:54 +0000 (11:52 -0400)
(This used to be commit 8e4dca3b9416d9b5e535bda5e4befc073bfc1641)

1  2 
source3/include/proto.h patch | diff1 | diff2 | blob | history
source3/passdb/lookup_sid.c patch | diff1 | diff2 | blob | history

diff --cc source3/include/proto.h
Simple merge
diff --cc source3/passdb/lookup_sid.c
Simple merge
Unnamed repository; edit this file to name it for gitweb.