diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-09-04 09:20:19 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-09-04 09:31:49 +1000 |
| commit | 3f42619e802b9dc13dc4dd770d419a0e4e9fce9d (patch) | |
| tree | 1673be7fbed7ccd01e87e8eb4ceb178bd9ac82f0 /source4/dns_server/wscript_build | |
| parent | 00108282d046c2d4948c7c5977c98b412e08fb0a (diff) | |
| download | samba-3f42619e802b9dc13dc4dd770d419a0e4e9fce9d.tar.gz samba-3f42619e802b9dc13dc4dd770d419a0e4e9fce9d.tar.bz2 samba-3f42619e802b9dc13dc4dd770d419a0e4e9fce9d.zip | |
docs: Remove merged-branches.txt
We are now well past simply having two projects in once tree, and each
continued reference to 'samba3' and 'samba4' causes user confusion.
Andrew Bartlett
Diffstat (limited to 'source4/dns_server/wscript_build')
0 files changed, 0 insertions, 0 deletions