CVS update: samba4/source/include

[Stefan Metzmacher]

Date:	Tue Feb  3 06:37:28 2004
Author:	metze

Update of /home/cvs/samba4/source/include
In directory dp.samba.org:/tmp/cvs-serv27000/include

Modified Files:
	nterr.h rpc_secdes.h smb_acls.h smb_macros.h 
Log Message:
do some merging from 3.0

metze


Revisions:
nterr.h		1.1.1.1 => 1.2
	http://www.samba.org/cgi-bin/cvsweb/samba4/source/include/nterr.h.diff?r1=1.1.1.1&r2=1.2
rpc_secdes.h		1.2 => 1.3
	http://www.samba.org/cgi-bin/cvsweb/samba4/source/include/rpc_secdes.h.diff?r1=1.2&r2=1.3
smb_acls.h		1.2 => 1.3
	http://www.samba.org/cgi-bin/cvsweb/samba4/source/include/smb_acls.h.diff?r1=1.2&r2=1.3
smb_macros.h		1.2 => 1.3
	http://www.samba.org/cgi-bin/cvsweb/samba4/source/include/smb_macros.h.diff?r1=1.2&r2=1.3