git.samba.org
/
obnox
/
samba
/
samba-obnox.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
2f265fe
d805c71
)
Merge branch 'master' of git://git.samba.org/samba
author
Jelmer Vernooij
<jelmer@samba.org>
Thu, 23 Oct 2008 16:04:16 +0000
(18:04 +0200)
committer
Jelmer Vernooij
<jelmer@samba.org>
Thu, 23 Oct 2008 16:04:16 +0000
(18:04 +0200)
Conflicts:
lib/util/asn1_proto.h
1
2
lib/util/config.mk
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
lib/util/config.mk
Simple merge