git.samba.org / abartlet / samba.git / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ddbddbd f0a2706)
Merge branch 'master' of ssh://git.samba.org/data/git/samba into arc4
authorJelmer Vernooij <jelmer@samba.org>
Sat, 11 Oct 2008 12:44:10 +0000 (14:44 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Sat, 11 Oct 2008 12:44:10 +0000 (14:44 +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
Unnamed repository; edit this file to name it for gitweb.