git.samba.org / metze / samba / wip.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: e8f5697 76dcbbd)
Resolve conflict of merging in J.Layton patch
authorSimo Sorce <idra@samba.org>
Mon, 17 Dec 2007 14:40:10 +0000 (09:40 -0500)
committerSimo Sorce <idra@samba.org>
Mon, 17 Dec 2007 14:40:10 +0000 (09:40 -0500)
commitf94e4619d1b2985881ec7ed76587057f00fbf1f7
treef6e8012efcb7012d09f4eb84344f9c5ce106d0bdtree
parente8f569735e2c0523efa175ca44dd919f838ae49ecommit | diff
parent76dcbbd1213ebf0212997d9a0599c894076d77bbcommit | diff
Resolve conflict of merging in J.Layton patch

Merge branch 'v3-0-test' of ssh://git.samba.org/data/git/samba into v3-0-simo

Conflicts:

source/client/mount.cifs.c
source/client/mount.cifs.c diff1 | diff2 | blob | history
Work in progress branches