git.samba.org / gd / samba / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ce47b69 2c0faaf)
Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Sun, 4 Jan 2009 21:48:23 +0000 (22:48 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 4 Jan 2009 21:48:23 +0000 (22:48 +0100)
1  2 
librpc/gen_ndr/named_pipe_auth.h patch | diff1 | diff2 | blob | history
source3/include/proto.h patch | diff1 | diff2 | blob | history

diff --cc librpc/gen_ndr/named_pipe_auth.h
Simple merge
diff --cc source3/include/proto.h
Simple merge
Samba Development trees