git.samba.org / gd / samba / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 33032d5 085e7b0)
Merge branch 'master' of ssh://git.samba.org/data/git/samba into crypt
authorJelmer Vernooij <jelmer@samba.org>
Sun, 19 Oct 2008 12:27:08 +0000 (14:27 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 19 Oct 2008 12:27:08 +0000 (14:27 +0200)
1  2 
source3/Makefile.in patch | diff1 | diff2 | blob | history
source3/include/proto.h patch | diff1 | diff2 | blob | history

diff --cc source3/Makefile.in
Simple merge
diff --cc source3/include/proto.h
Simple merge
Samba Development trees