diff options
author | Andrew Tridgell <tridge@samba.org> | 2008-05-28 12:07:20 +1000 |
---|---|---|
committer | Andrew Tridgell <tridge@samba.org> | 2008-05-28 12:07:20 +1000 |
commit | 275e057bea09c1d15228963a5b5650df28a4b24b (patch) | |
tree | fc24aee4174815930451e86f73d1997028169a49 /source4/lib/charset | |
parent | 0dbef08a9a4ae127f4eaf80dfbbb00e000bdf866 (diff) | |
parent | 715cee3bdbabd86b7603fbb43da470bdb8c1fe9d (diff) | |
download | samba-275e057bea09c1d15228963a5b5650df28a4b24b.tar.gz samba-275e057bea09c1d15228963a5b5650df28a4b24b.tar.bz2 samba-275e057bea09c1d15228963a5b5650df28a4b24b.zip |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
(This used to be commit ecb0e5477aa63180daade5c597e7ac2aebfc1e15)
Diffstat (limited to 'source4/lib/charset')
-rw-r--r-- | source4/lib/charset/util_unistr.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/charset/util_unistr.c b/source4/lib/charset/util_unistr.c index c496c5d905..19a4f3236c 100644 --- a/source4/lib/charset/util_unistr.c +++ b/source4/lib/charset/util_unistr.c @@ -20,7 +20,7 @@ #include "includes.h" #include "system/locale.h" -#include "dynconfig.h" +#include "dynconfig/dynconfig.h" #include "param/param.h" /** |