git.samba.org / abartlet / samba.git / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 3214fb0 3b9a03a)
Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Wed, 15 Oct 2008 14:16:01 +0000 (16:16 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 15 Oct 2008 14:16:01 +0000 (16:16 +0200)
1  2 
source3/include/proto.h patch | diff1 | diff2 | blob | history

diff --cc source3/include/proto.h
Simple merge
Unnamed repository; edit this file to name it for gitweb.