Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | docs: Remove merged-branches.txt | Andrew Bartlett | 2012-09-04 | 1 | -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 Metzmacher | 2008-09-11 | 1 | -0/+6 |
metze |