git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
bf0d5d0
0eded28
)
Merge remote branch 'origin/v4-0-test'
author
Stefan Metzmacher
<metze@samba.org>
Fri, 24 Dec 2010 11:10:43 +0000
(12:10 +0100)
committer
Stefan Metzmacher
<metze@samba.org>
Fri, 24 Dec 2010 11:11:08 +0000
(12:11 +0100)
'git merge -s ours origin/v4-0-test' to get the release tag into master.
metze
Trivial merge
git.samba.org / metze / samba / wip.git / commitdiff