git.samba.org / amitay / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 2c1b125 bc9bbda)
Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Mon, 20 Oct 2008 19:35:10 +0000 (21:35 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 20 Oct 2008 19:35:10 +0000 (21:35 +0200)
Conflicts:
source3/include/proto.h

1  2 
source3/include/includes.h patch | diff1 | diff2 | blob | history

diff --cc source3/include/includes.h
Simple merge
Amitay's Samba development tree