git.samba.org / obnox / samba-ctdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 64ff1da 3e32053)
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)
1  2 
source/Makefile.in patch | diff1 | diff2 | blob | history
source/configure.in patch | diff1 | diff2 | blob | history

diff --cc source/Makefile.in
Simple merge
diff --cc source/configure.in
Simple merge
SAMBA-CTDB repository