git.samba.org / kai / samba-autobuild / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9d2d666 0b68762)
Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Thu, 23 Oct 2008 19:59:15 +0000 (21:59 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 23 Oct 2008 19:59:15 +0000 (21:59 +0200)
1  2 
source4/param/loadparm.c patch | diff1 | diff2 | blob | history

diff --cc source4/param/loadparm.c
Simple merge
Unnamed repository; edit this file 'description' to name the repository.