]> git.ipfire.org Git - thirdparty/samba.git/commitdiff
projects / thirdparty / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: a8707a4 640847b)
Merge branch 'master' of ssh://git.samba.org/data/git/samba into crypt
authorJelmer Vernooij <jelmer@samba.org>
Mon, 20 Oct 2008 10:19:57 +0000 (12:19 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Mon, 20 Oct 2008 10:19:57 +0000 (12:19 +0200)
1  2 
source3/Makefile.in patch | diff1 | diff2 | blob | history

diff --cc source3/Makefile.in
Simple merge
Mirror of https://github.com/samba-team/samba.git