[parrot/parrot] e77c0b: merge from master. There was one conflict in the n...

[GitHub]

  Branch: refs/heads/threads
  Home:   https://github.com/parrot/parrot
  Commit: e77c0bde8c08a6f3a8bc3460ec315a72445dec53
      https://github.com/parrot/parrot/commit/e77c0bde8c08a6f3a8bc3460ec315a72445dec53
  Author: Whiteknight <wknight8111 at gmail.com>
  Date:   2012-07-14 (Sat, 14 Jul 2012)

  Changed paths:
    M .gitignore
    M CREDITS
    M ChangeLog
    M MANIFEST
    M MANIFEST.SKIP
    M MANIFEST.generated
    M README.pod
    M VERSION
    M config/auto/icu.pm
    M config/auto/pmc.pm
    M config/gen/makefiles/root.in
    M docs/parrothist.pod
    M docs/pdds/draft/pdd01_overview.pod
    M docs/pdds/draft/pdd05_opfunc.pod
    M docs/pdds/draft/pdd06_pasm.pod
    M docs/pdds/draft/pdd08_keys.pod
    M docs/pdds/draft/pdd13_bytecode.pod
    M docs/pdds/draft/pdd14_numbers.pod
    M docs/pdds/draft/pdd16_native_call.pod
    M docs/pdds/draft/pdd29_compiler_tools.pod
    M docs/pdds/pdd00_pdd.pod
    M docs/pdds/pdd03_calling_conventions.pod
    M docs/pdds/pdd07_codingstd.pod
    M docs/pdds/pdd09_gc.pod
    M docs/pdds/pdd10_embedding.pod
    M docs/pdds/pdd15_objects.pod
    M docs/pdds/pdd17_pmc.pod
    M docs/pdds/pdd18_security.pod
    M docs/pdds/pdd19_pir.pod
    M docs/pdds/pdd20_lexical_vars.pod
    M docs/pdds/pdd21_namespaces.pod
    M docs/pdds/pdd22_io.pod
    M docs/pdds/pdd23_exceptions.pod
    M docs/pdds/pdd24_events.pod
    M docs/pdds/pdd25_concurrency.pod
    M docs/pdds/pdd26_ast.pod
    M docs/pdds/pdd27_multiple_dispatch.pod
    M docs/pdds/pdd28_strings.pod
    M docs/pdds/pdd30_install.pod
    M docs/pdds/pdd_template.pod
    M docs/project/release_manager_guide.pod
    M frontend/parrot2/prt0.pir
    M frontend/parrot2/prt0.winxed
    M include/parrot/exit.h
    M include/parrot/gc_api.h
    M include/parrot/interpreter.h
    M include/parrot/oplib/core_ops.h
    M include/parrot/parrot.h
    M include/parrot/platform_interface.h
    R lib/Parrot/Pmc2c/Attribute.pm
    M lib/Parrot/Pmc2c/Emitter.pm
    R lib/Parrot/Pmc2c/MULTI.pm
    M lib/Parrot/Pmc2c/Method.pm
    R lib/Parrot/Pmc2c/Object.pm
    M lib/Parrot/Pmc2c/PCCMETHOD.pm
    M lib/Parrot/Pmc2c/PMC.pm
    M lib/Parrot/Pmc2c/Parser.pm
    M lib/Parrot/Pmc2c/Pmc2cMain.pm
    M src/dynoplibs/sys.ops
    M src/interp/api.c
    M src/ops/core.ops
    M src/ops/core_ops.c
    M src/platform/generic/misc.c
    M src/platform/win32/misc.c
    M src/runcore/subprof.c
    M t/dynoplibs/sysinfo.t
    M t/steps/auto/icu-01.t
    M tools/release/parrot_github_release.pl
    M tools/release/release.json

  Log Message:
  -----------
  merge from master. There was one conflict in the now-missing lib/Parrot/Pmc2c/Attributes.pm file. I've copied over some relevant bits of that file to the new home, but it doesn't work so I commented it out.


  Commit: e567a21119e1453e694dc8d1e056c3743878b0c0
      https://github.com/parrot/parrot/commit/e567a21119e1453e694dc8d1e056c3743878b0c0
  Author: Stefan Seifert <nine at detonation.org>
  Date:   2012-07-14 (Sat, 14 Jul 2012)

  Log Message:
  -----------
  Merge branch 'threads' of github.com:parrot/parrot into threads


Compare: https://github.com/parrot/parrot/compare/bb944b531d64...e567a21119e1