summaryrefslogtreecommitdiff
path: root/merged-branches.txt
AgeCommit message (Expand)AuthorFilesLines
2012-09-04docs: Remove merged-branches.txtAndrew Bartlett1-6/+0
2008-09-11prepare merging Samba3 and Samba4 together.Stefan Metzmacher1-0/+6