diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 16:46:22 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 16:46:22 +0200 |
| commit | 7fdca970407041af2f655690ddf1dc6a68d85fb7 (patch) | |
| tree | 481ab5a4c0aac872be76326f9f1278227dc0e291 /source4/main.mk | |
| parent | bf21371c098684ccad427a54ac76766c0021bc88 (diff) | |
| parent | 41669237cd714c59af9e634cb2ac162d6ee57e82 (diff) | |
| download | samba-7fdca970407041af2f655690ddf1dc6a68d85fb7.tar.gz samba-7fdca970407041af2f655690ddf1dc6a68d85fb7.tar.bz2 samba-7fdca970407041af2f655690ddf1dc6a68d85fb7.zip | |
Merge branch 'singlesw' into single
Conflicts:
source3/lib/socket_wrapper/socket_wrapper.c
source4/lib/replace/system/network.h
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 1fbffbd06e..52170821e8 100644 --- a/source4/main.mk +++ b/source4/main.mk @@ -16,7 +16,7 @@ mkinclude lib/registry/config.mk mkinclude lib/messaging/config.mk mkinclude lib/events/config.mk mkinclude lib/cmdline/config.mk -mkinclude lib/socket_wrapper/config.mk +mkinclude ../socket_wrapper/config.mk mkinclude lib/nss_wrapper/config.mk mkinclude lib/appweb/config.mk mkinclude lib/stream/config.mk |