diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-18 20:29:05 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-18 20:29:05 +0200 |
commit | 729ffbae086309992d7433a296fca64f6800f8fa (patch) | |
tree | 6c133d2b91ab9313da11bf8bad15f497e1b5c61f /source3/include/interfaces.h | |
parent | 88ad1a936ccd2451d6dbf542a0a746ad71a3e968 (diff) | |
parent | fc7050e54c69919d754ca0adf3f2f741a501fec4 (diff) | |
download | samba-729ffbae086309992d7433a296fca64f6800f8fa.tar.gz samba-729ffbae086309992d7433a296fca64f6800f8fa.tar.bz2 samba-729ffbae086309992d7433a296fca64f6800f8fa.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
Conflicts:
source4/main.mk
Diffstat (limited to 'source3/include/interfaces.h')
-rw-r--r-- | source3/include/interfaces.h | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/include/interfaces.h b/source3/include/interfaces.h index 84501cee41..9a19c33b57 100644 --- a/source3/include/interfaces.h +++ b/source3/include/interfaces.h @@ -24,8 +24,8 @@ #ifndef _INTERFACES_H #define _INTERFACES_H -#include "lib/replace/replace.h" -#include "lib/replace/system/network.h" +#include "../replace/replace.h" +#include "../replace/system/network.h" #define MAX_INTERFACES 128 |