From 790d1a148122926e067491519e4cbe79f53c5f45 Mon Sep 17 00:00:00 2001
From: Stefan Metzmacher <metze@samba.org>
Date: Thu, 11 Sep 2008 16:01:26 +0200
Subject: prepare merging Samba3 and Samba4 together.

metze
---
 merged-branches.txt | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 merged-branches.txt

diff --git a/merged-branches.txt b/merged-branches.txt
new file mode 100644
index 00000000000..064203f6720
--- /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.
-- 
cgit v1.2.1