git.samba.org - samba.git/commit

author	Jelmer Vernooij <jelmer@samba.org>
	Tue, 8 Apr 2008 01:45:06 +0000 (03:45 +0200)
committer	Jelmer Vernooij <jelmer@samba.org>
	Tue, 8 Apr 2008 01:45:06 +0000 (03:45 +0200)
commit	760378e0294dd0cd4523a83448328478632d7e3d
tree	0ed218daf366d0984c7bc03f94f0c8e95463b197	tree
parent	71110c8e7d58f42312938d0a8d0b216cbc313885	commit \| diff
parent	b6b7171f70114bd27ca8db09964c65cacb9cea92	commit \| diff

Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3

Conflicts:

source/auth/credentials/config.mk
source/auth/gensec/config.mk
source/build/smb_build/makefile.pm
source/heimdal_build/config.mk
source/lib/events/config.mk
source/lib/nss_wrapper/config.mk
source/lib/policy/config.mk
source/lib/registry/config.mk
source/lib/socket_wrapper/config.mk
source/lib/tdb/config.mk
source/lib/tls/config.mk
source/lib/util/config.mk
source/libcli/config.mk
source/libcli/ldap/config.mk
source/libnet/config.mk
source/librpc/config.mk
source/param/config.mk
source/rpc_server/config.mk
source/scripting/ejs/config.mk
source/smbd/process_model.mk

43 files changed:

source/Makefile	diff1 \|	diff2 \|	blob \| history
source/auth/auth.c	diff1 \|	diff2 \|	blob \| history
source/auth/config.mk	diff1 \|	diff2 \|	blob \| history
source/auth/credentials/config.mk	diff1 \|	diff2 \|	blob \| history
source/auth/gensec/config.mk	diff1 \|	diff2 \|	blob \| history
source/auth/gensec/gensec.c	diff1 \|	diff2 \|	blob \| history
source/build/make/rules.mk	diff1 \|	diff2 \|	blob \| history
source/client/config.mk	diff1 \|	diff2 \|	blob \| history
source/dsdb/config.mk	diff1 \|	diff2 \|	blob \| history
source/heimdal_build/config.mk	diff1 \|	diff2 \|	blob \| history
source/ldap_server/config.mk	diff1 \|	diff2 \|	blob \| history
source/lib/basic.mk	diff1 \|	diff2 \|	blob \| history
source/lib/events/config.mk	diff1 \|	diff2 \|	blob \| history
source/lib/policy/config.mk	diff1 \|	diff2 \|	blob \| history
source/lib/registry/config.mk	diff1 \|	diff2 \|	blob \| history
source/lib/registry/local.c	diff1 \|	diff2 \|	blob \| history
source/lib/socket_wrapper/config.mk	diff1 \|	diff2 \|	blob \| history
source/lib/talloc/config.mk	diff1 \|	diff2 \|	blob \| history
source/lib/tdb/config.mk	diff1 \|	diff2 \|	blob \| history
source/lib/tls/config.mk	diff1 \|	diff2 \|	blob \| history
source/lib/util/config.mk	diff1 \|	diff2 \|	blob \| history
source/libcli/auth/config.mk	diff1 \|	diff2 \|	blob \| history
source/libcli/config.mk	diff1 \|	diff2 \|	blob \| history
source/libcli/ldap/config.mk	diff1 \|	diff2 \|	blob \| history
source/libnet/config.mk	diff1 \|	diff2 \|	blob \| history
source/librpc/config.mk	diff1 \|	diff2 \|	blob \| history
source/nbt_server/config.mk	diff1 \|	diff2 \|	blob \| history
source/nsswitch/config.mk	diff1 \|	diff2 \|	blob \| history
source/ntvfs/config.mk	diff1 \|	diff2 \|	blob \| history
source/ntvfs/ntvfs_base.c	diff1 \|	diff2 \|	blob \| history
source/param/config.mk	diff1 \|	diff2 \|	blob \| history
source/rpc_server/config.mk	diff1 \|	diff2 \|	blob \| history
source/rpc_server/dcerpc_server.c	diff1 \|	diff2 \|	blob \| history
source/scripting/ejs/config.mk	diff1 \|	diff2 \|	blob \| history
source/scripting/python/modules.c	diff1 \|	diff2 \|	blob \| history
source/smbd/config.mk	diff1 \|	diff2 \|	blob \| history
source/smbd/process_model.c	diff1 \|	diff2 \|	blob \| history
source/smbd/process_model.mk	diff1 \|	diff2 \|	blob \| history
source/smbd/server.c	diff1 \|	diff2 \|	blob \| history
source/torture/config.mk	diff1 \|	diff2 \|	blob \| history
source/torture/torture.c	diff1 \|	diff2 \|	blob \| history
source/utils/config.mk	diff1 \|	diff2 \|	blob \| history
source/utils/net/config.mk	diff1 \|	diff2 \|	blob \| history

Samba Shared Repository

RSS Atom

source/Makefile	diff1 \|	diff2 \|	blob \| history
source/auth/auth.c	diff1 \|	diff2 \|	blob \| history
source/auth/config.mk	diff1 \|	diff2 \|	blob \| history
source/auth/credentials/config.mk	diff1 \|	diff2 \|	blob \| history
source/auth/gensec/config.mk	diff1 \|	diff2 \|	blob \| history
source/auth/gensec/gensec.c	diff1 \|	diff2 \|	blob \| history
source/build/make/rules.mk	diff1 \|	diff2 \|	blob \| history
source/client/config.mk	diff1 \|	diff2 \|	blob \| history
source/dsdb/config.mk	diff1 \|	diff2 \|	blob \| history
source/heimdal_build/config.mk	diff1 \|	diff2 \|	blob \| history
source/ldap_server/config.mk	diff1 \|	diff2 \|	blob \| history
source/lib/basic.mk	diff1 \|	diff2 \|	blob \| history
source/lib/events/config.mk	diff1 \|	diff2 \|	blob \| history
source/lib/policy/config.mk	diff1 \|	diff2 \|	blob \| history
source/lib/registry/config.mk	diff1 \|	diff2 \|	blob \| history
source/lib/registry/local.c	diff1 \|	diff2 \|	blob \| history
source/lib/socket_wrapper/config.mk	diff1 \|	diff2 \|	blob \| history
source/lib/talloc/config.mk	diff1 \|	diff2 \|	blob \| history
source/lib/tdb/config.mk	diff1 \|	diff2 \|	blob \| history
source/lib/tls/config.mk	diff1 \|	diff2 \|	blob \| history
source/lib/util/config.mk	diff1 \|	diff2 \|	blob \| history
source/libcli/auth/config.mk	diff1 \|	diff2 \|	blob \| history
source/libcli/config.mk	diff1 \|	diff2 \|	blob \| history
source/libcli/ldap/config.mk	diff1 \|	diff2 \|	blob \| history
source/libnet/config.mk	diff1 \|	diff2 \|	blob \| history
source/librpc/config.mk	diff1 \|	diff2 \|	blob \| history
source/nbt_server/config.mk	diff1 \|	diff2 \|	blob \| history
source/nsswitch/config.mk	diff1 \|	diff2 \|	blob \| history
source/ntvfs/config.mk	diff1 \|	diff2 \|	blob \| history
source/ntvfs/ntvfs_base.c	diff1 \|	diff2 \|	blob \| history
source/param/config.mk	diff1 \|	diff2 \|	blob \| history
source/rpc_server/config.mk	diff1 \|	diff2 \|	blob \| history
source/rpc_server/dcerpc_server.c	diff1 \|	diff2 \|	blob \| history
source/scripting/ejs/config.mk	diff1 \|	diff2 \|	blob \| history
source/scripting/python/modules.c	diff1 \|	diff2 \|	blob \| history
source/smbd/config.mk	diff1 \|	diff2 \|	blob \| history
source/smbd/process_model.c	diff1 \|	diff2 \|	blob \| history
source/smbd/process_model.mk	diff1 \|	diff2 \|	blob \| history
source/smbd/server.c	diff1 \|	diff2 \|	blob \| history
source/torture/config.mk	diff1 \|	diff2 \|	blob \| history
source/torture/torture.c	diff1 \|	diff2 \|	blob \| history
source/utils/config.mk	diff1 \|	diff2 \|	blob \| history
source/utils/net/config.mk	diff1 \|	diff2 \|	blob \| history