| commit | 34f310caafa4dcaa834a7912ed5ae9415ca859a5 | |
| author | Gerald Carter <jerry@samba.org> | |
| Thu, 9 Sep 2004 15:32:06 +0000 (9 15:32 +0000) | ||
| committer | Gerald Carter <jerry@samba.org> | |
| Thu, 9 Sep 2004 15:32:06 +0000 (9 15:32 +0000) | ||
| tree | 44d2a91554004b29847573d8d99ab3030a4c6d46 | treesnapshot (tar.gz zip) |
| parent | dce8dc898b448c994ecb901dd3611394c2544214 | commitdiff |
r2268: More merges
svn merge -r 2263:2264 $SVNURL/branches/SAMBA_3_0
svn merge -r 2198:2210 $SVNURL/branches/SAMBA_3_0
copy trans2.c and reply.c from 3.0 (jra's pathname parsing)
svn merge -r 2263:2264 $SVNURL/branches/SAMBA_3_0
svn merge -r 2198:2210 $SVNURL/branches/SAMBA_3_0
copy trans2.c and reply.c from 3.0 (jra's pathname parsing)
| examples/pdb/pdb_test.c | diffblobblamehistory | |
| source/nsswitch/winbind_nss_solaris.c | diffblobblamehistory | |
| source/smbd/reply.c | diffblobblamehistory |