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/lib/registry/registry.i | |
| 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/lib/registry/registry.i')
| -rw-r--r-- | source4/lib/registry/registry.i | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/source4/lib/registry/registry.i b/source4/lib/registry/registry.i index c55197c3d0..fe3a81d889 100644 --- a/source4/lib/registry/registry.i +++ b/source4/lib/registry/registry.i @@ -43,7 +43,7 @@ typedef struct hive_key hive_key; } %import "stdint.i" -%import "../../lib/talloc/talloc.i" +%import "../../../lib/talloc/talloc.i" %import "../../auth/credentials/credentials.i" %import "../../param/param.i" %import "../events/events.i" |