source: trunk/server/merged-branches.txt@ 1036

Last change on this file since 1036 was 414, checked in by Herwig Bauernfeind, 16 years ago

Samba 3.5.0: Initial import

File size: 262 bytes
Line 
1This branch contains sources for both Samba 3 and Samba 4. The Samba 3
2source/ folder is now called source3, the samba4 source/ folder is called
3source4.
4
5The aim is to move shared code to a common location
6and hopefully combine Samba3 and Samba 4 step by step.
Note: See TracBrowser for help on using the repository browser.