Jelmer Vernooij b5d84a74d1 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 (This used to be commit 760378e029)		2008-04-08 03:45:06 +02:00
..
m4	Merge v4.0-test	2008-03-28 00:44:14 +01:00
make	Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3	2008-04-08 03:45:06 +02:00
pasn1	Convert some more files to GPLv3.	2008-03-28 01:08:49 -05:00
smb_build	Don't write public functions to protoheaders.	2008-04-02 00:01:04 +02:00
tests	r26421: build: we now have HAVE_IFACE_GETIFADDRS as valid interface detection code	2007-12-21 05:49:49 +01:00