git.samba.org / amitay / samba.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9e6b0c2 52669d8)
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
authorAndrew Bartlett <abartlet@samba.org>
Tue, 18 Mar 2008 23:18:35 +0000 (10:18 +1100)
committerAndrew Bartlett <abartlet@samba.org>
Tue, 18 Mar 2008 23:18:35 +0000 (10:18 +1100)
(This used to be commit 400c16e7004bc3a881bb6efb99a273cdac87f70c)

1  2 
source4/heimdal_build/config.mk patch | diff1 | diff2 | blob | history

diff --cc source4/heimdal_build/config.mk
Simple merge
Amitay's Samba development tree