svn commit: samba r1490 - in branches/tmp/SAMBA_3_2_MERGE/source: . lib libcli/util rpc_parse rpc_server utils

Wed Jul 14 01:44:51 GMT 2004

Author: jerry
Date: 2004-07-14 01:44:51 +0000 (Wed, 14 Jul 2004)
New Revision: 1490

Modified:
   branches/tmp/SAMBA_3_2_MERGE/source/Makefile.in
   branches/tmp/SAMBA_3_2_MERGE/source/lib/time.c
   branches/tmp/SAMBA_3_2_MERGE/source/libcli/util/smbdes.c
   branches/tmp/SAMBA_3_2_MERGE/source/rpc_parse/parse_net.c
   branches/tmp/SAMBA_3_2_MERGE/source/rpc_server/srv_netlog_nt.c
   branches/tmp/SAMBA_3_2_MERGE/source/utils/pdbedit.c
Log:
more merge fixes

WebSVN: http://websvn.samba.org/websvn/changeset.php?rep=samba&path=/branches/tmp/SAMBA_3_2_MERGE/source&rev=1490&nolog=1