diff options
author | Stefan Metzmacher <metze@samba.org> | 2008-09-14 23:07:26 +0200 |
---|---|---|
committer | Stefan Metzmacher <metze@samba.org> | 2008-09-14 23:07:26 +0200 |
commit | 9d3d3320928e43a972b88024a52986331d0dbee0 (patch) | |
tree | f39f10c50ffbefc11de940812178100fbe0a5420 /source4/libcli/resolve | |
parent | 790d1a148122926e067491519e4cbe79f53c5f45 (diff) | |
parent | 4f2b99646bb88bbae2fb84b7199cab607577b3db (diff) | |
parent | a1cf3ad5d655cf5a847df6d6299b3af1a30ec1e3 (diff) | |
download | samba-9d3d3320928e43a972b88024a52986331d0dbee0.tar.gz samba-9d3d3320928e43a972b88024a52986331d0dbee0.tar.bz2 samba-9d3d3320928e43a972b88024a52986331d0dbee0.zip |
Merge Samba3 and Samba4 together