git.samba.org / obnox / samba / samba-obnox.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 91437ea ecca199)
Merge branch 'master' of git://git.samba.org/samba
authorJelmer Vernooij <jelmer@samba.org>
Tue, 14 Oct 2008 22:15:34 +0000 (00:15 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 14 Oct 2008 22:15:34 +0000 (00:15 +0200)
1  2 
source3/Makefile.in patch | diff1 | diff2 | blob | history
source4/configure.ac patch | diff1 | diff2 | blob | history

diff --cc source3/Makefile.in
Simple merge
diff --cc source4/configure.ac
Simple merge
Michael's Samba GIT