Merge branch 'v4-0-test' into id10ts-registry
authorJelmer Vernooij <jelmer@samba.org>
Sun, 2 Mar 2008 23:23:09 +0000 (00:23 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Sun, 2 Mar 2008 23:23:09 +0000 (00:23 +0100)
commitc7dc53b8514f83800184d2b20b1897e54843a614
tree4f09d783271dc5e38809ed02c8252d73f8b147e5
parent375df425c5014dc852995038e8e5668f98af8ba3
parent85d53f7b603f7c15b007f8c3fdde1989f07a6eb2
Merge branch 'v4-0-test' into id10ts-registry
(This used to be commit f98b59021a5ea39c7970ebc5520d17775e500b8c)
source4/lib/registry/ldb.c
source4/lib/registry/regf.c
source4/lib/registry/tests/hive.c