summaryrefslogtreecommitdiff
path: root/merged-branches.txt
Commit message (Collapse)AuthorAgeFilesLines
* docs: Remove merged-branches.txtAndrew Bartlett2012-09-041-6/+0
| | | | | | | 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
* prepare merging Samba3 and Samba4 together.Stefan Metzmacher2008-09-111-0/+6
metze