git.samba.org
/
metze
/
samba
/
wip.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(initial)
prepare merging Samba3 and Samba4 together.
author
Stefan Metzmacher
<metze@samba.org>
Thu, 11 Sep 2008 14:01:26 +0000
(16:01 +0200)
committer
Stefan Metzmacher
<metze@samba.org>
Thu, 11 Sep 2008 14:01:26 +0000
(16:01 +0200)
metze
merged-branches.txt
[new file with mode: 0644]
patch
|
blob
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.