summaryrefslogtreecommitdiff
path: root/merged-branches.txt
AgeCommit message (Collapse)AuthorFilesLines
2012-09-04docs: Remove merged-branches.txtAndrew Bartlett1-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
2008-09-11prepare merging Samba3 and Samba4 together.Stefan Metzmacher1-0/+6
metze