| commit | 01987778a123f853fccdcb7fe9566143e2d7c490 | |
| author | Jelmer Vernooij <jelmer@samba.org> | |
| Wed, 21 May 2008 16:04:47 +0000 (21 18:04 +0200) | ||
| committer | Jelmer Vernooij <jelmer@samba.org> | |
| Wed, 21 May 2008 16:04:47 +0000 (21 18:04 +0200) | ||
| tree | 9e46e01b843627b31feba9e590651e9a8a3a1b69 | treesnapshot (tar.gz zip) |
| parent | 825cf91fa8b30a67d04cbda8885ff62a4c26458f | commitdiff |
| parent | bda0f03fb3fa8a7b14d4f54bee7076d691cad44f | commitdiff |
Merge branch 'v3-3-test' of ssh://git.samba.org/data/git/samba into docbook
Conflicts:
source/Makefile.in
Conflicts:
source/Makefile.in
| source/Makefile.in | diff1 | diff2 | blobhistory |