git.samba.org / metze / samba / wip.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5e7655f 95cc5ee)
Merge branch 'v3-devel' of ssh://git.samba.org/data/git/samba into v3-devel
authorSimo Sorce <idra@samba.org>
Tue, 26 Aug 2008 22:56:49 +0000 (18:56 -0400)
committerSimo Sorce <idra@samba.org>
Tue, 26 Aug 2008 22:56:49 +0000 (18:56 -0400)
(This used to be commit e038f1cf9fb305fc1e7a4189208e451d30aaa1f0)

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
Work in progress branches