git.samba.org
/
samba.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0010828
)
docs: Remove merged-branches.txt
author
Andrew Bartlett
<abartlet@samba.org>
Mon, 3 Sep 2012 23:20:19 +0000
(09:20 +1000)
committer
Andrew Bartlett
<abartlet@samba.org>
Mon, 3 Sep 2012 23:31:49 +0000
(09:31 +1000)
We are now well past simply having two projects in once tree, and each
continued reference to 'samba3' and 'samba4' causes user confusion.
Andrew Bartlett
merged-branches.txt
[deleted file]
patch
|
blob
|
history
diff --git
a/merged-branches.txt
b/merged-branches.txt
deleted file mode 100644
(file)
index
064203f
..0000000
--- a/
merged-branches.txt
+++ /dev/null
@@
-1,6
+0,0 @@
-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.