git.samba.org / jra / samba / .git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: d70eafc afe8e53)
Merge branch 'v4-0-trivial' into v4-0-test
authorJelmer Vernooij <jelmer@samba.org>
Thu, 28 Feb 2008 17:27:29 +0000 (18:27 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Thu, 28 Feb 2008 17:27:29 +0000 (18:27 +0100)
(This used to be commit 6cbb241c05539cc62526a366094c9c472e6422a5)

1  2 
source4/ntvfs/posix/pvfs_rename.c patch | diff1 | diff2 | blob | history

diff --cc source4/ntvfs/posix/pvfs_rename.c
Simple merge
Experimental branches for jra