[parrot/parrot] c1fab7: Merge branch 'master' into generational_gc

noreply at github.com noreply at github.com
Thu Feb 3 21:57:46 UTC 2011


Branch: refs/heads/generational_gc
Home:   https://github.com/parrot/parrot

Commit: c1fab7d7fb6ec2a4657016c8f3bfea78f0f8dccb
    https://github.com/parrot/parrot/commit/c1fab7d7fb6ec2a4657016c8f3bfea78f0f8dccb
Author: Vasily Chekalkin <bacek at bacek.com>
Date:   2011-02-03 (Thu, 03 Feb 2011)

Changed paths:
  M .gitignore
  M MANIFEST
  M MANIFEST.SKIP
  M MANIFEST.generated
  M api.yaml
  M compilers/imcc/imcc.l
  M compilers/imcc/imclexer.c
  M compilers/imcc/imcparser.c
  M compilers/imcc/imcparser.h
  M compilers/imcc/main.c
  M compilers/pct/src/PAST/Compiler.pir
  M compilers/pct/src/POST/Node.pir
  M config/gen/makefiles/root.in
  M docs/project/release_manager_guide.pod
  M frontend/parrot/main.c
  M include/parrot/api.h
  M include/parrot/gc_api.h
  M include/parrot/interpreter.h
  M include/parrot/longopt.h
  M include/parrot/runcore_profiling.h
  M lib/Parrot/Pmc2c/MethodEmitter.pm
  M lib/Parrot/Pmc2c/PMCEmitter.pm
  A runtime/parrot/library/YAML/Tiny.pm
  M src/embed/api.c
  M src/exceptions.c
  M src/gc/api.c
  M src/gc/fixed_allocator.c
  M src/gc/fixed_allocator.h
  M src/gc/gc_inf.c
  M src/gc/gc_ms.c
  M src/gc/gc_ms2.c
  M src/gc/gc_private.h
  M src/gc/mark_sweep.c
  M src/gc/string_gc.c
  M src/interp/inter_create.c
  M src/interp/inter_misc.c
  M src/ops/core.ops
  M src/platform/generic/error.c
  M src/pmc/sockaddr.pmc
  M src/runcore/profiling.c
  M src/string/api.c
  M t/codingstd/perlcritic.t
  A t/library/yaml_tiny.t
  M t/op/gc-leaky-box.t
  M t/op/gc-leaky-call.t
  M t/op/stringu.t
  M t/pmc/socket_ipv6.t
  M t/pmc/testlib/test_server_ipv6.pir
  M t/run/options.t
  M t/src/embed/api.t
  R t/tools/show_deprecated.t
  R t/tools/show_experimental.t
  M tools/dev/pbc_to_exe.pir
  A tools/dev/resolve_deprecated.nqp
  A tools/dev/show_deprecated.nqp
  R tools/dev/show_deprecated.pl
  A tools/dev/show_experimental.nqp
  R tools/dev/show_experimental.pl

Log Message:
-----------
Merge branch 'master' into generational_gc

Conflicts:
	src/gc/api.c
	src/gc/fixed_allocator.h




More information about the parrot-commits mailing list