Author: metze Date: 2005-10-14 12:44:11 +0000 (Fri, 14 Oct 2005) New Revision: 11012
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=11012 Log: Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/source/include/structs.h branches/SAMBA_4_0/source/libcli/dgram/libdgram.h branches/SAMBA_4_0/source/libcli/dgram/ntlogon.c branches/SAMBA_4_0/source/libcli/nbt/namerefresh.c branches/SAMBA_4_0/source/libcli/nbt/nameregister.c branches/SAMBA_4_0/source/librpc/idl/winsrepl.idl branches/SAMBA_4_0/source/main.mk branches/SAMBA_4_0/source/smbd/config.mk branches/SAMBA_4_0/source/torture/nbt/dgram.c Changeset: Property changes on: branches/SAMBA_4_0 ___________________________________________________________________ Name: svk:merge - 0c0555d6-39d7-0310-84fc-f1cc0bd64818:/branches/tmp/samba4-winsrepl:10124 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:10128 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/include/structs.h =================================================================== Modified: branches/SAMBA_4_0/source/libcli/dgram/libdgram.h =================================================================== Modified: branches/SAMBA_4_0/source/libcli/dgram/ntlogon.c =================================================================== Modified: branches/SAMBA_4_0/source/libcli/nbt/namerefresh.c =================================================================== Modified: branches/SAMBA_4_0/source/libcli/nbt/nameregister.c =================================================================== Modified: branches/SAMBA_4_0/source/librpc/idl/winsrepl.idl =================================================================== Modified: branches/SAMBA_4_0/source/main.mk =================================================================== Modified: branches/SAMBA_4_0/source/smbd/config.mk =================================================================== Modified: branches/SAMBA_4_0/source/torture/nbt/dgram.c ===================================================================