Jelmer Vernooij 6267dd7853 Clean up some git merges gone wrong. ... (This used to be commit 42eb6b3346)		2008-05-10 20:59:17 +02:00
..
m4	Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3	2008-05-10 20:44:59 +02:00
make	Merge branch 'v4-0-test' into v4-0-gmake3	2008-05-10 18:08:00 +02:00
pasn1	Convert some more files to GPLv3.	2008-03-28 01:08:49 -05:00
smb_build	Clean up some git merges gone wrong.	2008-05-10 20:59:17 +02:00
tests	r26421: build: we now have HAVE_IFACE_GETIFADDRS as valid interface detection code	2007-12-21 05:49:49 +01:00