git.samba.org
/
sfrench
/
samba-autobuild
/
.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
661d254
f429361
)
Merge branch 'master' of ssh://git.samba.org/data/git/samba into singlerpc
author
Jelmer Vernooij
<jelmer@samba.org>
Wed, 17 Sep 2008 17:00:46 +0000
(19:00 +0200)
committer
Jelmer Vernooij
<jelmer@samba.org>
Wed, 17 Sep 2008 17:00:46 +0000
(19:00 +0200)
Conflicts:
source3/Makefile.in
Trivial merge