diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-06-10 15:05:41 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-06-10 15:05:41 +0200 |
| commit | 01fc095d6e2fa1b883b3f429085b4aca4254f105 (patch) | |
| tree | 51ca606a357c9c626dbd8067ec89fa9263445e1f /source4/main.mk | |
| parent | ffbea676771bae16be547529eb1136c61d78203f (diff) | |
| parent | 7206c5fc4a0fc9d310fef199c6ff9d0300bc956b (diff) | |
| download | samba-01fc095d6e2fa1b883b3f429085b4aca4254f105.tar.gz samba-01fc095d6e2fa1b883b3f429085b4aca4254f105.tar.bz2 samba-01fc095d6e2fa1b883b3f429085b4aca4254f105.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-fixmodulesdir
(This used to be commit 74e1dd28f2f669bc196dc16b68c8b175bf835721)
Diffstat (limited to 'source4/main.mk')
| -rw-r--r-- | source4/main.mk | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/main.mk b/source4/main.mk index 3f3aea87e6..f0ce9685f9 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -1,5 +1,5 @@ mkinclude dynconfig/config.mk -mkinclude heimdal_build/config.mk +mkinclude heimdal_build/internal.mk mkinclude config.mk mkinclude dsdb/config.mk mkinclude smbd/config.mk |