diff options
author | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
---|---|---|
committer | Jelmer Vernooij <jelmer@samba.org> | 2008-10-21 14:51:13 +0200 |
commit | 5209a846a9157e649fcdcb561f7eaf19c8c0e465 (patch) | |
tree | b0a7e52b5646c8eec182dbc391e7934b6804488c /source4/headermap.txt | |
parent | 625359b2e266105022309df8985720108ecd6f67 (diff) | |
parent | 2ee8d29d22bcb1c350ab59d71b0aee548489bc9c (diff) | |
download | samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.gz samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.tar.bz2 samba-5209a846a9157e649fcdcb561f7eaf19c8c0e465.zip |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into regsrv
Conflicts:
source4/lib/registry/ldb.c
source4/rpc_server/winreg/rpc_winreg.c
Diffstat (limited to 'source4/headermap.txt')
-rw-r--r-- | source4/headermap.txt | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/source4/headermap.txt b/source4/headermap.txt index e2bbb167ed..43119d2695 100644 --- a/source4/headermap.txt +++ b/source4/headermap.txt @@ -1,18 +1,18 @@ # FIXME: This file should be autogenerated by the build system at some # point -lib/util/util.h: util.h -lib/util/debug.h: util/debug.h -lib/util/mutex.h: util/mutex.h -lib/util/attr.h: util/attr.h -lib/util/byteorder.h: util/byteorder.h -lib/util/safe_string.h: util/safe_string.h -lib/util/xfile.h: util/xfile.h +../lib/util/util.h: util.h +../lib/util/debug.h: util/debug.h +../lib/util/mutex.h: util/mutex.h +../lib/util/attr.h: util/attr.h +../lib/util/byteorder.h: util/byteorder.h +../lib/util/safe_string.h: util/safe_string.h +../lib/util/xfile.h: util/xfile.h lib/tdr/tdr.h: tdr.h librpc/rpc/dcerpc.h: dcerpc.h lib/ldb/include/ldb.h: ldb.h lib/ldb/include/ldb_errors.h: ldb_errors.h auth/gensec/gensec.h: gensec.h -librpc/ndr/libndr.h: ndr.h +../librpc/ndr/libndr.h: ndr.h lib/registry/registry.h: registry.h libcli/util/werror.h: core/werror.h libcli/util/doserr.h: core/doserr.h @@ -52,21 +52,21 @@ librpc/gen_ndr/svcctl.h: gen_ndr/svcctl.h librpc/gen_ndr/ndr_svcctl.h: gen_ndr/ndr_svcctl.h librpc/gen_ndr/ndr_svcctl_c.h: gen_ndr/ndr_svcctl_c.h lib/cmdline/popt_common.h: samba/popt.h -lib/util/dlinklist.h: dlinklist.h -lib/util/data_blob.h: util/data_blob.h -lib/util/time.h: util/time.h +../lib/util/dlinklist.h: dlinklist.h +../lib/util/data_blob.h: util/data_blob.h +../lib/util/time.h: util/time.h version.h: samba/version.h param/param.h: param.h -lib/util/asn1.h: samba/asn1.h +../lib/util/asn1.h: samba/asn1.h libcli/util/error.h: core/error.h lib/tdb_wrap.h: tdb_wrap.h lib/ldb_wrap.h: ldb_wrap.h torture/smbtorture.h: smbtorture.h librpc/gen_ndr/winbind.h: gen_ndr/winbind.h param/share.h: share.h -lib/util/util_tdb.h: util_tdb.h -lib/util/util_ldb.h: util_ldb.h -lib/util/wrap_xattr.h: wrap_xattr.h +../lib/util/util_tdb.h: util_tdb.h +../lib/util/util_ldb.h: util_ldb.h +../lib/util/wrap_xattr.h: wrap_xattr.h lib/events/events.h: events/events.h lib/events/events_internal.h: events/events_internal.h libcli/ldap/ldap_ndr.h: ldap_ndr.h |