Merge branch 'master' into nwellnhof/gc_dynamic_threshold

parrot · Feb 2, 2011 · 715b2ea · 715b2ea
2 parents d34ec47 + bc265ee
commit 715b2ea
Show file tree

Hide file tree

Showing 29 changed files with 3,029 additions and 2,470 deletions.
diff --git a/MANIFEST b/MANIFEST
@@ -1154,6 +1154,7 @@ runtime/parrot/library/URI/Escape.pir                       [library]
 runtime/parrot/library/YAML/Dumper.pir                      [library]
 runtime/parrot/library/YAML/Dumper/Base.pir                 [library]
 runtime/parrot/library/YAML/Dumper/Default.pir              [library]
+runtime/parrot/library/YAML/Tiny.pm                         [library]
 runtime/parrot/library/distutils.pir                        [library]
 runtime/parrot/library/dumper.pir                           [library]
 runtime/parrot/library/libpcre.pir                          [library]
@@ -1694,6 +1695,7 @@ t/library/uri.t                                             [test]
 t/library/uri_escape.t                                      [test]
 t/library/uuid.t                                            [test]
 t/library/yaml_dumper.t                                     [test]
+t/library/yaml_tiny.t                                       [test]
 t/manifest/01-basic.t                                       [test]
 t/manifest/02-regenerate_file.t                             [test]
 t/manifest/03-regenerate_skip.t                             [test]
@@ -2080,8 +2082,6 @@ t/tools/pmc2cutils/04-dump_pmc.t                            [test]
 t/tools/pmc2cutils/05-gen_c.t                               [test]
 t/tools/pmc2cutils/08-pmc-pm.t                              [test]
 t/tools/pmc2cutils/README                                   []doc
-t/tools/show_deprecated.t                                   [test]
-t/tools/show_experimental.t                                 [test]
 t/tools/testdata                                            [test]
 tools/build/README                                          []doc
 tools/build/c2str.pl                                        []
@@ -2148,9 +2148,10 @@ tools/dev/pmcrenumber.pl                                    []
 tools/dev/pmctree.pl                                        []
 tools/dev/pprof2cg.pl                                       [devel]
 tools/dev/reconfigure.pl                                    [devel]
+tools/dev/resolve_deprecated.nqp                            []
 tools/dev/search-ops.pl                                     []
-tools/dev/show_deprecated.pl                                []
-tools/dev/show_experimental.pl                              []
+tools/dev/show_deprecated.nqp                               []
+tools/dev/show_experimental.nqp                             []
 tools/dev/symlink.pl                                        []
 tools/dev/update_copyright.pl                               []
 tools/dev/vgp                                               []

diff --git a/MANIFEST.generated b/MANIFEST.generated
@@ -310,6 +310,7 @@ runtime/parrot/library/Test/Builder/Tester.pbc   [main]
 runtime/parrot/library/Test/Class.pbc            [main]
 runtime/parrot/library/Test/More.pbc             [main]
 runtime/parrot/library/URI.pbc                   [main]
+runtime/parrot/library/YAML/Tiny.pbc             [main]
 runtime/parrot/library/YAML/Dumper.pbc           [main]
 runtime/parrot/library/YAML/Dumper/Base.pmc      [main]
 runtime/parrot/library/YAML/Dumper/Default.pmc   [main]