diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-11 18:26:28 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-11 18:26:28 +0100 |
| commit | 5aa0a70b06317b7ae77385210fe41bbc2d3c6c5c (patch) | |
| tree | a4032b21532f29b956b1bd08c3b2647251939d64 /swat2.txt | |
| parent | a19534d2072ca7dc4c70767d02db58503678cfaa (diff) | |
| parent | 98fdbb61260b19bc97675336993f3fcb5f470f90 (diff) | |
| download | samba-5aa0a70b06317b7ae77385210fe41bbc2d3c6c5c.tar.gz samba-5aa0a70b06317b7ae77385210fe41bbc2d3c6c5c.tar.bz2 samba-5aa0a70b06317b7ae77385210fe41bbc2d3c6c5c.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-trivial
Conflicts:
source/Makefile
source/rules.mk
(This used to be commit fc9b9853124c8d172172f88e1e4939db5970df25)
Diffstat (limited to 'swat2.txt')
0 files changed, 0 insertions, 0 deletions