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 | |
| 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
| -rw-r--r-- | merged-branches.txt | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/merged-branches.txt b/merged-branches.txt deleted file mode 100644 index 064203f672..0000000000 --- a/merged-branches.txt +++ /dev/null @@ -1,6 +0,0 @@ -This branch contains sources for both Samba 3 and Samba 4. The Samba 3 -source/ folder is now called source3, the samba4 source/ folder is called -source4. - -The aim is to move shared code to a common location -and hopefully combine Samba3 and Samba 4 step by step. |