diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-04-04 16:02:17 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-04-04 16:02:17 +0200 |
| commit | 30ccc36b8d61f2d09c3f0adeec4db0ab540619b8 (patch) | |
| tree | 740fd5c06ebffb4991ede45182447d317603d115 /swat2.txt | |
| parent | adc09857420c4a9306148e8d15ff5faf633ba7a5 (diff) | |
| parent | c26387a473fd26ac51c74c001b520d7fd7d353ec (diff) | |
| download | samba-30ccc36b8d61f2d09c3f0adeec4db0ab540619b8.tar.gz samba-30ccc36b8d61f2d09c3f0adeec4db0ab540619b8.tar.bz2 samba-30ccc36b8d61f2d09c3f0adeec4db0ab540619b8.zip | |
Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into openchange
Conflicts:
source/headermap.txt
(This used to be commit 1b084e85c1f5963d924f7764ae751f8cd8e57364)
Diffstat (limited to 'swat2.txt')
0 files changed, 0 insertions, 0 deletions