[parrot/parrot] 5a9b56: Merge branch 'master' into nqp_pct

noreply at github.com noreply at github.com
Mon Jun 13 15:55:38 UTC 2011


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

  Commit: 5a9b56d499707d5ce95b50a2c36b72216e72f9fe
      https://github.com/parrot/parrot/commit/5a9b56d499707d5ce95b50a2c36b72216e72f9fe
  Author: Brian Gernhardt <brian.gernhardt at mail.rit.edu>
  Date:   2011-06-13 (Mon, 13 Jun 2011)

  Changed paths:
    M .gitignore
  M CREDITS
  M MANIFEST
  M MANIFEST.SKIP
  M MANIFEST.generated
  M NEWS
  M api.yaml
  M config/auto/opengl.pm
  M config/auto/readline.pm
  M config/gen/makefiles/root.in
  M config/init/hints/darwin.pm
  M docs/deprecations/how_to_deprecate.pod
  A ext/winxed/Defines.mak
  A ext/winxed/README
  A ext/winxed/Rules.mak
  A ext/winxed/compiler.pir
  A ext/winxed/driver.pir
  M frontend/pbc_merge/main.c
  M include/parrot/embed.h
  M include/parrot/gc_api.h
  M include/parrot/interpreter.h
  M include/parrot/packfile.h
  M include/parrot/pmc.h
  M include/parrot/warnings.h
  M lib/Parrot/Configure/Compiler.pm
  M lib/Parrot/Configure/Options.pm
  M lib/Parrot/Configure/Options/Conf/File.pm
  M lib/Parrot/Git/Describe.pm
  M lib/Parrot/Revision.pm
  M lib/Parrot/SHA1.pm
  M runtime/parrot/library/Digest/sha256.pir
  M runtime/parrot/library/NCI/Utils.pir
  M src/call/args.c
  M src/call/pcc.c
  M src/embed.c
  M src/embed/bytecode.c
  M src/extend.c
  M src/gc/api.c
  M src/gc/gc_gms.c
  M src/gc/gc_private.h
  M src/interp/inter_create.c
  M src/interp/inter_misc.c
  M src/ops/core_ops.c
  M src/ops/experimental.ops
  M src/packfile/api.c
  M src/platform/generic/file.c
  M src/pmc.c
  M src/pmc/hash.pmc
  M src/pmc/structview.pmc
  M src/string/api.c
  M t/harness
  M t/library/nciutils.t
  M t/library/pcre.t
  M t/library/sha.t
  M t/pmc/nci.t
  M t/src/checkdepend.t
  M t/src/embed/api.t
  M t/src/extend.t
  M t/src/extend_vtable.t
  M t/steps/auto/platform-01.t
  M t/steps/auto/readline-01.t
  M tools/dev/install_dev_files.pl

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

Conflicts:
	compilers/pct/src/PAST/Compiler.pir
	compilers/pct/src/PAST/Node.pir




More information about the parrot-commits mailing list