Merged release21-maint changes.
diff --git a/Mac/Distributions/src.include b/Mac/Distributions/src.include
index 61a0221..a380332 100644
--- a/Mac/Distributions/src.include
+++ b/Mac/Distributions/src.include
@@ -5,9 +5,8 @@
(':Demo', '')
(':Doc', None)
(':EditPythonPrefs', None)
-(':Extensions:Icon\015', None)
+(':Extensions:Icon\r', None)
(':Extensions:Imaging', None)
-(':Extensions:Numerical', '')
(':Extensions:Pmw', None)
(':Extensions:PyDOM', None)
(':Extensions:README', '')
@@ -19,9 +18,9 @@
(':Extensions:saxlib', None)
(':Extensions:xmltok', None)
(':Grammar:Grammar', '')
-(':Grammar:Icon\015', None)
+(':Grammar:Icon\r', None)
(':Grammar:Makefile', None)
-(':Icon\015', None)
+(':Icon\r', None)
(':Include', '')
(':LICENSE', '')
(':Lib', '')
@@ -45,12 +44,14 @@
(':Mac:Distributions:binary.include', '')
(':Mac:Distributions:dev.exclude', '')
(':Mac:Distributions:dev.include', '')
+(':Mac:Distributions:gusi2.exclude', None)
+(':Mac:Distributions:gusi2.include', None)
(':Mac:Distributions:readme.txt', '')
(':Mac:Distributions:src.exclude', '')
(':Mac:Distributions:src.include', '')
(':Mac:HISTORY', ':Relnotes:')
(':Mac:IDE scripts', '')
-(':Mac:Icon\015', None)
+(':Mac:Icon\r', None)
(':Mac:Include', '')
(':Mac:Lib', '')
(':Mac:MPW', '')
@@ -66,7 +67,7 @@
(':Mac:Tools:CGI', '')
(':Mac:Tools:CGI:BuildCGIApplet', None)
(':Mac:Tools:IDE', None)
-(':Mac:Tools:Icon\015', None)
+(':Mac:Tools:Icon\r', None)
(':Mac:Tools:PyIDE', None)
(':Mac:Tools:bruce', None)
(':Mac:Tools:macfreeze', '')
@@ -98,7 +99,7 @@
(':PythonStandSmallThreading', None)
(':PythonStandalone', None)
(':README', '')
-(':Tools:Icon\015', None)
+(':Tools:Icon\r', None)
(':Tools:README', '')
(':Tools:audiopy', '')
(':Tools:bgen', '')
@@ -110,6 +111,7 @@
(':Tools:modulator', '')
(':Tools:pynche', '')
(':Tools:scripts', '')
+(':Tools:unicode:makeunicodedata.py', '')
(':Tools:versioncheck', '')
(':Tools:webchecker', '')
(':Tools:world', '')
@@ -124,6 +126,15 @@
(':mkapplet', None)
(':pystone.py', None)
(':site-packages', None)
-(':Mac:Distributions:gusi2.include', None)
-(':Mac:Distributions:gusi2.exclude', None)
-(':Tools:unicode:makeunicodedata.py', '')
+(':setup.py', None)
+(':PythonInterpreterClassic', None)
+(':PythonInterpreterCarbon', None)
+(':PythonCoreCarbon', None)
+(':ConfigurePythonClassic', None)
+(':ConfigurePythonCarbon', None)
+(':Extensions:example', '')
+(':Mac:OSX', '')
+(':Mac:Wastemods', '')
+(':Extensions:example2', '')
+(':Extensions:example3', '')
+(':RISCOS', None)