git.samba.org
/
tprouty
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
4bbaf36
baad7a7
)
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-test
author
Andrew Tridgell
<tridge@samba.org>
Thu, 17 Apr 2008 07:36:09 +0000
(09:36 +0200)
committer
Andrew Tridgell
<tridge@samba.org>
Thu, 17 Apr 2008 07:36:09 +0000
(09:36 +0200)
Conflicts:
source/ntvfs/ntvfs_generic.c
(This used to be commit
a626a9c69cb2c07c8de69dcfe45361f86d6de58d
)
Trivial merge
git.samba.org / tprouty / samba.git / commitdiff