git.samba.org
/
sfrench
/
samba-autobuild
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a19534d
98fdbb6
)
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
author
Jelmer Vernooij
<jelmer@samba.org>
Mon, 11 Feb 2008 17:26:28 +0000
(18:26 +0100)
committer
Jelmer Vernooij
<jelmer@samba.org>
Mon, 11 Feb 2008 17:26:28 +0000
(18:26 +0100)
Conflicts:
source/Makefile
source/rules.mk
(This used to be commit
fc9b9853124c8d172172f88e1e4939db5970df25
)
Trivial merge