prepare merging Samba3 and Samba4 together.

metze

diff --git a/merged-branches.txt b/merged-branches.txt
new file mode 100644 (file)
index 0000000..064203f
--- /dev/null
+++ b/merged-branches.txt
@@ -0,0 +1,6 @@
+This branch contains sources for both Samba 3 and Samba 4. The Samba 3
+source/ folder is now called source3, the samba4 source/ folder is called
+source4.
+
+The aim is to move shared code to a common location
+and hopefully combine Samba3 and Samba 4 step by step.