svn commit: samba r11028 - in branches/SAMBA_4_0: . source source/client source/gtk/tools source/heimdal/lib/asn1 source/heimdal/lib/com_err source/heimdal/lib/roken source/heimdal/lib/vers source/ldap_server source/lib source/lib/cmdline source/lib/ldb/common source/lib/replace source/param source/script/tests source/torture source/utils

[metze at samba.org]

Author: metze
Date: 2005-10-14 12:51:06 +0000 (Fri, 14 Oct 2005)
New Revision: 11028

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11028

Log:

Modified:
   branches/SAMBA_4_0/
   branches/SAMBA_4_0/source/client/client.c
   branches/SAMBA_4_0/source/dynconfig.c
   branches/SAMBA_4_0/source/gtk/tools/gregedit.c
   branches/SAMBA_4_0/source/heimdal/lib/asn1/
   branches/SAMBA_4_0/source/heimdal/lib/com_err/
   branches/SAMBA_4_0/source/heimdal/lib/roken/
   branches/SAMBA_4_0/source/heimdal/lib/vers/
   branches/SAMBA_4_0/source/ldap_server/ldap_rootdse.c
   branches/SAMBA_4_0/source/lib/cmdline/credentials.c
   branches/SAMBA_4_0/source/lib/cmdline/popt_common.c
   branches/SAMBA_4_0/source/lib/ldb/common/ldb_msg.c
   branches/SAMBA_4_0/source/lib/replace/
   branches/SAMBA_4_0/source/lib/util.c
   branches/SAMBA_4_0/source/param/loadparm.c
   branches/SAMBA_4_0/source/script/tests/selftest.sh
   branches/SAMBA_4_0/source/torture/torture.c
   branches/SAMBA_4_0/source/utils/ntlm_auth.c


Changeset:

Property changes on: branches/SAMBA_4_0
___________________________________________________________________
Name: svk:merge
   - 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/tmp/samba4-winsrepl:10319
3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba4:9495
a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:11632
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5616
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5609
   + 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/tmp/samba4-winsrepl:10320
3a72dc49-98ff-0310-ab52-9b7ed7945d91:/local/samba4:9495
a953eb74-4aff-0310-a63c-855d20285ebb:/local/samba4:11632
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/SAMBA_4_0:5616
d349723c-e9fc-0310-b8a8-fdedf1c27407:/local/samba-SAMBA_4_0:5609

Modified: branches/SAMBA_4_0/source/client/client.c
===================================================================

Modified: branches/SAMBA_4_0/source/dynconfig.c
===================================================================

Modified: branches/SAMBA_4_0/source/gtk/tools/gregedit.c
===================================================================

Modified: branches/SAMBA_4_0/source/ldap_server/ldap_rootdse.c
===================================================================

Modified: branches/SAMBA_4_0/source/lib/cmdline/credentials.c
===================================================================

Modified: branches/SAMBA_4_0/source/lib/cmdline/popt_common.c
===================================================================

Modified: branches/SAMBA_4_0/source/lib/ldb/common/ldb_msg.c
===================================================================

Modified: branches/SAMBA_4_0/source/lib/util.c
===================================================================

Modified: branches/SAMBA_4_0/source/param/loadparm.c
===================================================================

Modified: branches/SAMBA_4_0/source/script/tests/selftest.sh
===================================================================

Modified: branches/SAMBA_4_0/source/torture/torture.c
===================================================================

Modified: branches/SAMBA_4_0/source/utils/ntlm_auth.c
===================================================================