git.samba.org / metze / samba / wip.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3ba8fbe 4a413e4)
Merge branch 'v3-2-test' of ssh://git.samba.org/data/git/samba into v3-2-test
authorJelmer Vernooij <jelmer@samba.org>
Sat, 5 Jan 2008 22:09:38 +0000 (23:09 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 5 Jan 2008 22:09:38 +0000 (23:09 +0100)
(This used to be commit 5a30f6377d37d8a5cadce4fb9a2fc19b78fc1709)

1  2 
source3/Makefile.in patch | diff1 | diff2 | blob | history
source3/configure.in patch | diff1 | diff2 | blob | history

diff --cc source3/Makefile.in
Simple merge
diff --cc source3/configure.in
Simple merge
Work in progress branches