git.samba.org / ira / wip.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 323be4a 1a416ff)
Merge branch 'v3-3-test' of ssh://git.samba.org/data/git/samba into docbook
authorJelmer Vernooij <jelmer@samba.org>
Wed, 21 May 2008 16:04:47 +0000 (18:04 +0200)
committerJelmer Vernooij <jelmer@samba.org>
Wed, 21 May 2008 16:04:47 +0000 (18:04 +0200)
commit20796bcf57a7f5e1921dc12e0568221f985fe4f2
tree8f0540a602a9ea0031d656bc31c0b8bc1e91eb70tree
parent323be4a6907e4915bb76aa103bf5b868f0b459b1commit | diff
parent1a416ff13ca7786f2e8d24c66addf00883e9cb12commit | diff
Merge branch 'v3-3-test' of ssh://git.samba.org/data/git/samba into docbook

Conflicts:

source/Makefile.in
(This used to be commit 01987778a123f853fccdcb7fe9566143e2d7c490)
source3/Makefile.in diff1 | diff2 | blob | history
Unnamed repository; edit this file 'description' to name the repository.