Andrew Bartlett ae977ef247 Fix merge errors on C provision interface after jelmer's good work. ... Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into 4-0-abartlet Conflicts: source/torture/local/torture.c (This used to be commit 5bf1c89cf8)		2008-04-11 11:11:42 +10:00
..
config.mk	libreplace: add extended getifaddrs test that prints out the interfaces.	2008-02-28 23:01:15 +01:00
dbspeed.c	r26588: Janitorial: Rename torture_*_add_*test to torture_*_add_*test_const.	2007-12-26 11:57:05 -06:00
local.c	r26346: Add tests for loadparm.	2007-12-21 05:48:52 +01:00
torture.c	Fix merge errors on C provision interface after jelmer's good work.	2008-04-11 11:11:42 +10:00