git.samba.org / gd / samba / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 80a5da7 8ec9316)
Merge branch 'singletdb' into single
authorJelmer Vernooij <jelmer@samba.org>
Tue, 16 Sep 2008 14:44:16 +0000 (16:44 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 16 Sep 2008 14:44:16 +0000 (16:44 +0200)
1  2 
source3/configure.in patch | diff1 | diff2 | blob | history
source4/Makefile patch | diff1 | diff2 | blob | history
source4/configure.ac patch | diff1 | diff2 | blob | history

diff --cc source3/configure.in
Simple merge
diff --cc source4/Makefile
Simple merge
diff --cc source4/configure.ac
Simple merge
Samba Development trees