git.samba.org / garming / samba-autobuild / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cda8762 9c466a6)
Merge branch 'singlecompression' into single
authorJelmer Vernooij <jelmer@samba.org>
Tue, 16 Sep 2008 17:07:59 +0000 (19:07 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Tue, 16 Sep 2008 17:07:59 +0000 (19:07 +0200)
1  2 
source3/Makefile.in patch | diff1 | diff2 | blob | history
source4/Makefile patch | diff1 | diff2 | blob | history
source4/torture/local/config.mk patch | diff1 | diff2 | blob | history

diff --cc source3/Makefile.in
Simple merge
diff --cc source4/Makefile
Simple merge
diff --cc source4/torture/local/config.mk
Simple merge
Unnamed repository; edit this file 'description' to name the repository.