Jelmer Vernooij cc9c4aaa8d Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3 ... Conflicts: source/Makefile source/auth/config.mk source/auth/gensec/config.mk source/build/m4/public.m4 source/build/make/python.mk source/build/make/rules.mk source/build/smb_build/header.pm source/build/smb_build/main.pl source/build/smb_build/makefile.pm source/dsdb/config.mk source/dsdb/samdb/ldb_modules/config.mk source/kdc/config.mk source/lib/events/config.mk source/lib/events/events.c source/lib/ldb/config.mk source/lib/nss_wrapper/config.mk source/lib/policy/config.mk source/lib/util/config.mk source/libcli/smb2/config.mk source/libnet/config.mk source/librpc/config.mk source/nbt_server/config.mk source/ntptr/ntptr_base.c source/ntvfs/posix/config.mk source/ntvfs/sysdep/config.mk source/param/config.mk source/rpc_server/config.mk source/rpc_server/service_rpc.c source/scripting/ejs/config.mk source/scripting/python/config.mk source/smb_server/config.mk source/smbd/server.c source/torture/config.mk source/torture/smb2/config.mk source/wrepl_server/config.mk (This used to be commit 13bbd42068)		2008-04-25 10:04:20 +01:00
..
cldap_server.c	Specify event_context to ldb_wrap_connect explicitly.	2008-04-17 12:23:44 +02:00
cldap_server.h	cldap_server: fix compiler warning	2008-03-28 09:39:03 +01:00
config.mk	Move object files lists to makefile rather than smb_build.	2008-04-14 16:53:00 +02:00
netlogon.c	Remove prototypes from build.h in preparation of removing build.h	2008-04-14 11:54:50 +02:00
rootdse.c	r26003: Split up DB_WRAP, as first step in an attempt to sanitize dependencies.	2007-12-21 05:45:40 +01:00