Kill another merge zombie.

diff --git a/Demo/sockets/ChangeLog b/Demo/sockets/ChangeLog
deleted file mode 100755 (executable)
index c1d41b1..0000000
--- a/Demo/sockets/ChangeLog
+++ /dev/null
@@ -1,35 +0,0 @@
-Mon Nov 16 17:55:30 1992  Guido van Rossum  (guido@voorn.cwi.nl)
-
-* Restructured mcast.
-
-Tue Nov  3 13:08:41 1992  Guido van Rossum  (guido@voorn.cwi.nl)
-
-* Fixed ftp.py to use 'global' instead of a hack
-
-25-Oct-1992
-
-* Added gopher.py
-
-2-Oct-1992
-
-* Changed /usr/local/python to /usr/local/bin/python
-
-Thu Sep 24 12:33:56 1992  Guido van Rossum  (guido@voorn.cwi.nl)
-
-* Improved computation of mcast group bytes (use regsub.gsub())
-
-Tue Sep  8 23:20:51 1992  Guido van Rossum  (guido@voorn.cwi.nl)
-
-* Added mcast.py and IN.py.
-
-* Use setsockopt() instead of allowbroadcast() in broadcast.py.
-
-Mon Aug 10 12:45:43 1992  Guido van Rossum  (guido@voorn.cwi.nl)
-
-* README: added broadcast.py, ftp.py, radio.py
-
--------------------------------------------------------------------------------
-^^^ Log entries after release of 0.9.6 ^^^
--------------------------------------------------------------------------------
-
-

diff --git a/Demo/tkinter/Tree.py b/Demo/tkinter/Tree.py
deleted file mode 100644 (file)
index 010fbd4..0000000
--- a/Demo/tkinter/Tree.py
+++ /dev/null
@@ -1,23 +0,0 @@
-from Tkinter import *
-
-class Tree:
-
-       def __init__(self, master, cnf = {}):
-               self.master = master
-               self.outerframe = Frame(self.master,
-                                       {'name': 'outerframe',
-                                        Pack: {},
-                                        })
-               self.innerframe = Frame(self.outerframe,
-                                       {'name': 'innerframe',
-                                        Pack: {'side': 'left',
-                                               'fill': 'y'},
-                                        })
-               self.button = Menubutton(self.innerframe,
-                                        {'name': 'button',
-                                         Pack: {},
-                                         })
-               # menu?
-
-       def addchild(self):
-               return Tree(self.outerframe, {})