git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
e462a10
0c1ccbc
)
Merge branch 'v4-0-test' of git://git.samba.org/samba into 4-0-local
author
Andrew Bartlett
<abartlet@samba.org>
Thu, 6 Mar 2008 20:38:44 +0000
(07:38 +1100)
committer
Andrew Bartlett
<abartlet@samba.org>
Thu, 6 Mar 2008 20:38:44 +0000
(07:38 +1100)
1
2
source/scripting/python/samba/provision.py
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
source/scripting/python/samba/provision.py
Simple merge