diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 13:33:35 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 13:33:35 +0100 |
| commit | 1131d4c2545355ef793e468810655c0f72828368 (patch) | |
| tree | 6812d6bfd27835a9992e4addb98329da6c087d22 /source4/samba4-skip | |
| parent | 94c937ffb0109effa55117c525db941194893091 (diff) | |
| parent | 5e336bea1c68fafa97f67abf89c678d3cd7250b8 (diff) | |
| download | samba-1131d4c2545355ef793e468810655c0f72828368.tar.gz samba-1131d4c2545355ef793e468810655c0f72828368.tar.bz2 samba-1131d4c2545355ef793e468810655c0f72828368.zip | |
Merge branch 'v4-0-trivial' into v4-0-gmake3
Conflicts:
source/build/smb_build/makefile.pm
(This used to be commit 4d190270463f8db475c152f5502c9de01765d904)
Diffstat (limited to 'source4/samba4-skip')
0 files changed, 0 insertions, 0 deletions