git.samba.org
/
jelmer
/
ctrlproxy.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
dbaa93b
7e36532
)
[merge] trunk
author
Jelmer Vernooij
<jelmer@samba.org>
Sun, 21 May 2006 18:09:52 +0000
(20:09 +0200)
committer
Jelmer Vernooij
<jelmer@samba.org>
Sun, 21 May 2006 18:09:52 +0000
(20:09 +0200)
1
2
Makefile.settings.in
patch
|
diff1
|
diff2
|
blob
|
history
admin.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
Makefile.settings.in
Simple merge
diff --cc
admin.c
Simple merge
git.samba.org / jelmer / ctrlproxy.git / commitdiff