From: Nick Ing-Simmons <nik@tiuk.ti.com>
Date: Sun, 30 Dec 2001 10:03:43 +0000 (+0000)
Subject: Integrate mainline
X-Git-Url: http://git.shadowcat.co.uk/gitweb/gitweb.cgi?a=commitdiff_plain;h=a6d41b5b8482c8372f6c7df99166303413988eb2;p=p5sagit%2Fp5-mst-13.2.git

Integrate mainline

p4raw-id: //depot/perl@13945
---

diff --git a/MANIFEST b/MANIFEST
index 3f21578..4b8178c 100644
--- a/MANIFEST
+++ b/MANIFEST
@@ -110,6 +110,7 @@ ext/ByteLoader/byterun.c	Runtime support for bytecode loader
 ext/ByteLoader/byterun.h	Header for byterun.c
 ext/ByteLoader/hints/sunos.pl	Hints for named architecture
 ext/ByteLoader/Makefile.PL	Bytecode loader makefile writer
+ext/Cwd/Cwd.pm			Various cwd routines (getcwd, fastcwd, chdir)
 ext/Cwd/Cwd.xs			Cwd extension external subroutines
 ext/Cwd/Makefile.PL		Cwd extension makefile maker
 ext/Cwd/t/cwd.t			See if Cwd works
@@ -898,7 +899,6 @@ lib/CPAN/t/loadme.t		See if CPAN the module works
 lib/CPAN/t/Nox.t		See if CPAN::Nox works
 lib/CPAN/t/vcmp.t		See if CPAN the module works
 lib/ctime.pl			A ctime workalike
-lib/Cwd.pm			Various cwd routines (getcwd, fastcwd, chdir)
 lib/DB.pm			Debugger API (draft)
 lib/DB.t			See if DB works
 lib/Devel/SelfStubber.pm	Generate stubs for SelfLoader.pm
@@ -2117,7 +2117,7 @@ t/lib/dprof/test6_t		Perl code profiler tests
 t/lib/dprof/test6_v		Perl code profiler tests
 t/lib/dprof/V.pm		Perl code profiler tests
 t/lib/filter-util.pl		See if Filter::Util::Call works
-t/lib/Filter/Simple/ExportTest.pm	Helper file for Filter::Simple tests 
+t/lib/Filter/Simple/ExportTest.pm	Helper file for Filter::Simple tests
 t/lib/Filter/Simple/FilterOnlyTest.pm	Helper file for Filter::Simple tests
 t/lib/Filter/Simple/FilterTest.pm	Helper file for Filter::Simple tests
 t/lib/Filter/Simple/ImportTest.pm	Helper file for Filter::Simple tests
diff --git a/lib/Cwd.pm b/ext/Cwd/Cwd.pm
similarity index 100%
rename from lib/Cwd.pm
rename to ext/Cwd/Cwd.pm