git.samba.org / obnox / samba-ctdb.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b74d641 a272a3c)
Merge commit 'origin/v3-2-stable' into v3-2-ctdb
authorVolker Lendecke <vl@samba.org>
Thu, 5 Jun 2008 13:25:43 +0000 (15:25 +0200)
committerVolker Lendecke <vl@samba.org>
Thu, 5 Jun 2008 13:26:06 +0000 (15:26 +0200)
1  2 
source/param/loadparm.c patch | diff1 | diff2 | blob | history
source/winbindd/winbindd_cm.c patch | diff1 | diff2 | blob | history

diff --cc source/param/loadparm.c
Simple merge
diff --cc source/winbindd/winbindd_cm.c
Simple merge
SAMBA-CTDB repository