summaryrefslogtreecommitdiff
path: root/source4/lib/basic.mk
diff options
context:
space:
mode:
authorAndrew Bartlett <abartlet@samba.org>2008-05-01 16:41:36 +1000
committerAndrew Bartlett <abartlet@samba.org>2008-05-01 16:41:36 +1000
commit30a45df36612bc4b9aaae07031fc9486d8fe6a7c (patch)
tree07790cdb45218c7a8d1d99d00b73d1e6c2834978 /source4/lib/basic.mk
parent7c5704499a9881493f8bdfcefb095b50ab072a02 (diff)
parentaedaba990f02fd1f613c1830d3774843cf8d5f0d (diff)
downloadsamba-30a45df36612bc4b9aaae07031fc9486d8fe6a7c.tar.gz
samba-30a45df36612bc4b9aaae07031fc9486d8fe6a7c.tar.bz2
samba-30a45df36612bc4b9aaae07031fc9486d8fe6a7c.zip
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet
(This used to be commit 6bb4c1e6a38a842787177a399bf88f05015f5ec0)
Diffstat (limited to 'source4/lib/basic.mk')
-rw-r--r--source4/lib/basic.mk1
1 files changed, 1 insertions, 0 deletions
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index 71acb94492..e7e0ba80c4 100644
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -16,6 +16,7 @@ mkinclude util/config.mk
mkinclude tdr/config.mk
mkinclude dbwrap/config.mk
mkinclude crypto/config.mk
+mkinclude torture/config.mk
[SUBSYSTEM::LIBCOMPRESSION]