summaryrefslogtreecommitdiff
path: root/source4/heimdal_build
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-06-10 13:19:56 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-06-10 13:19:56 +1000
commit7721ea8f9c75d304111935048167dd27525cc91a (patch)
treefdc6563d085003cf6fe003748fb85291166a5454 /source4/heimdal_build
parent7974ccbebf5c684200850a726d79b976eaeea261 (diff)
parent1384f836b601d35f3c499a9e26c3e3b0d12b3ad0 (diff)
downloadsamba-7721ea8f9c75d304111935048167dd27525cc91a.tar.gz
samba-7721ea8f9c75d304111935048167dd27525cc91a.tar.bz2
samba-7721ea8f9c75d304111935048167dd27525cc91a.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-local
(This used to be commit 1d52d9cc70158dbe30325220aa5c1e6203c8b72b)
Diffstat (limited to 'source4/heimdal_build')
-rw-r--r--source4/heimdal_build/internal.m4 (renamed from source4/heimdal_build/config.m4)0
-rw-r--r--source4/heimdal_build/internal.mk (renamed from source4/heimdal_build/config.mk)0
2 files changed, 0 insertions, 0 deletions
diff --git a/source4/heimdal_build/config.m4 b/source4/heimdal_build/internal.m4
index 18ecbb75cd..18ecbb75cd 100644
--- a/source4/heimdal_build/config.m4
+++ b/source4/heimdal_build/internal.m4
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/internal.mk
index 17fc8c93ec..17fc8c93ec 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/internal.mk