diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-04 16:02:17 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-04 16:02:17 +0200 |
| commit | 30ccc36b8d61f2d09c3f0adeec4db0ab540619b8 (patch) | |
| tree | 740fd5c06ebffb4991ede45182447d317603d115 /source4/headermap.txt | |
| parent | adc09857420c4a9306148e8d15ff5faf633ba7a5 (diff) | |
| parent | c26387a473fd26ac51c74c001b520d7fd7d353ec (diff) | |
| download | samba-30ccc36b8d61f2d09c3f0adeec4db0ab540619b8.tar.gz | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into openchange
Conflicts:
source/headermap.txt
(This used to be commit 1b084e85c1f5963d924f7764ae751f8cd8e57364)
Diffstat (limited to 'source4/headermap.txt')
| -rw-r--r-- | source4/headermap.txt | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/source4/headermap.txt b/source4/headermap.txt index 7984149837..fbfc56e127 100644 --- a/source4/headermap.txt +++ b/source4/headermap.txt @@ -66,6 +66,8 @@ 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/events/events.h: events/events.h +lib/events/events_internal.h: events/events_internal.h libcli/ldap/ldap_ndr.h: ldap_ndr.h lib/events/events.h: events.h lib/events/events_internal.h: events_internal.h |