git.samba.org / gd / samba-autobuild / .git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: a8725f1 ca2da61)
Merge branch 'singlensswrap' into single
authorJelmer Vernooij <jelmer@samba.org>
Tue, 16 Sep 2008 15:07:11 +0000 (17:07 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 16 Sep 2008 15:07:11 +0000 (17:07 +0200)
commita347ab83f447d7921d5d427e56f6965342b25834
tree68e38df8ccb86498f08809201f132cfe0a598fe5tree
parenta8725f18fa5cac16583ba16cd8d54ee1ae492524commit | diff
parentca2da6154068c8fb9ef89407d34deb9bb8f5fbfacommit | diff
Merge branch 'singlensswrap' into single

Conflicts:
source3/configure.in
source4/Makefile
source4/configure.ac
source4/lib/nss_wrapper/nss_wrapper.c
source4/lib/replace/system/passwd.h
source4/main.mk
nss_wrapper/nss_wrapper.c diff1 | diff2 | blob | history
replace/system/passwd.h diff1 | diff2 | blob | history
source3/configure.in diff1 | diff2 | blob | history
source4/Makefile diff1 | diff2 | blob | history
source4/configure.ac diff1 | diff2 | blob | history
source4/main.mk diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.