diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 16:45:10 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 16:45:10 +0200 |
commit | bf21371c098684ccad427a54ac76766c0021bc88 (patch) | |
tree | ed1d0dce7dda8d41c6dcefdfe23eea35df1ced0c /source4/heimdal_build/gssapi-glue.c | |
parent | f957aeaee64745148b815393b1fc1338104ed2e1 (diff) | |
parent | 0888ffa2b7382a1c4781ae54bad53eac3b229365 (diff) | |
download | samba-bf21371c098684ccad427a54ac76766c0021bc88.tar.gz samba-bf21371c098684ccad427a54ac76766c0021bc88.tar.bz2 samba-bf21371c098684ccad427a54ac76766c0021bc88.zip |
Merge branch 'singlereplace' into single
Conflicts:
source4/configure.ac
source4/torture/local/config.mk
Diffstat (limited to 'source4/heimdal_build/gssapi-glue.c')
-rw-r--r-- | source4/heimdal_build/gssapi-glue.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/heimdal_build/gssapi-glue.c b/source4/heimdal_build/gssapi-glue.c index 0885c2165b..c71b69463c 100644 --- a/source4/heimdal_build/gssapi-glue.c +++ b/source4/heimdal_build/gssapi-glue.c @@ -19,7 +19,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. */ -#include "lib/replace/replace.h" +#include "../replace/replace.h" void *__gss_ntlm_initialize(void) { |