git.samba.org / jra / samba / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: de7dc2c 0581094)
Merge branch 'master' of ssh://git.samba.org/data/git/samba
authorJelmer Vernooij <jelmer@samba.org>
Mon, 5 Jan 2009 17:01:04 +0000 (18:01 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 5 Jan 2009 17:01:04 +0000 (18:01 +0100)
1  2 
source3/include/includes.h patch | diff1 | diff2 | blob | history
source3/include/proto.h patch | diff1 | diff2 | blob | history

diff --cc source3/include/includes.h
Simple merge
diff --cc source3/include/proto.h
Simple merge
Experimental branches for jra