1
0
mirror of https://github.com/samba-team/samba.git synced 2025-01-21 18:04:06 +03:00
Jelmer Vernooij 4e750552b7 Merge branch 'v4-0-trivial' into v4-0-gmake3
Conflicts:

	source/build/smb_build/main.pl
	source/build/smb_build/makefile.pm
(This used to be commit d31987461984aebf8c6f2513e83c92757c0f83c7)
2008-02-18 11:59:02 +01:00
..
2007-10-10 12:56:50 -05:00