summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2008-09-11 16:01:26 +0200
committerStefan Metzmacher <metze@samba.org>2008-09-11 16:01:26 +0200
commit790d1a148122926e067491519e4cbe79f53c5f45 (patch)
tree6f961f5f0cfef6a4b07b4c1e9e056cc7e5ab6996
downloadsamba-790d1a148122926e067491519e4cbe79f53c5f45.tar.gz
samba-790d1a148122926e067491519e4cbe79f53c5f45.tar.bz2
samba-790d1a148122926e067491519e4cbe79f53c5f45.zip
prepare merging Samba3 and Samba4 together.
metze
-rw-r--r--merged-branches.txt6
1 files changed, 6 insertions, 0 deletions
diff --git a/merged-branches.txt b/merged-branches.txt
new file mode 100644
index 0000000000..064203f672
--- /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.