diff options
author | Jeremy Allison <jra@samba.org> | 2007-12-21 13:14:59 -0800 |
---|---|---|
committer | Jeremy Allison <jra@samba.org> | 2007-12-21 13:14:59 -0800 |
commit | 9a2b54dfb695d36eafed3e2184bc6c1d34a408f9 (patch) | |
tree | b2a5aaf1e4a9491f6cd38bf4ff2fd0b35f5a902a /source3/nsswitch/libwbclient/libwbclient.h | |
parent | b775fe0a170f9b6043aaea2c025fd70528c7e7e8 (diff) | |
parent | f2ebf076a41cf96b0367049ee979d5b98052b3db (diff) | |
download | samba-9a2b54dfb695d36eafed3e2184bc6c1d34a408f9.tar.gz samba-9a2b54dfb695d36eafed3e2184bc6c1d34a408f9.tar.bz2 samba-9a2b54dfb695d36eafed3e2184bc6c1d34a408f9.zip |
Merge branch 'v3-2-test' of ssh://jra@git.samba.org/data/git/samba into v3-2-test
Conflicts:
source/library-versions.in
(This used to be commit 11acca7d3884731491709dd09b7de2edc8bb5811)
Diffstat (limited to 'source3/nsswitch/libwbclient/libwbclient.h')
0 files changed, 0 insertions, 0 deletions