[parrot/parrot] 3b5ee3: Merge branch 'master' into threads

GitHub noreply at github.com
Fri Mar 23 17:21:16 UTC 2012


  Branch: refs/heads/threads
  Home:   https://github.com/parrot/parrot
  Commit: 3b5ee3c4147b60d1072e045f629b66b530be541d
      https://github.com/parrot/parrot/commit/3b5ee3c4147b60d1072e045f629b66b530be541d
  Author: Stefan Seifert <nine at detonation.org>
  Date:   2012-03-23 (Fri, 23 Mar 2012)

  Changed paths:
    M .travis.yml
  M CREDITS
  M ChangeLog
  M MANIFEST
  M MANIFEST.generated
  M README
  M RESPONSIBLE_PARTIES
  M VERSION
  M compilers/imcc/cfg.c
  M compilers/imcc/imcc.y
  M compilers/imcc/imcparser.c
  M compilers/imcc/imcparser.h
  M compilers/imcc/main.c
  M compilers/imcc/pbc.c
  M compilers/imcc/pcc.c
  M compilers/opsc/src/Ops/Emitter.pm
  M compilers/opsc/src/Ops/Trans/C.pm
  M compilers/pct/src/PAST/Compiler.pir
  M compilers/pct/src/PCT/HLLCompiler.pir
  M config/auto/byteorder.pm
  M config/auto/gcc.pm
  M config/auto/headers.pm
  M config/auto/icu.pm
  M config/auto/warnings.pm
  M config/gen/makefiles/root.in
  M config/init/hints/cygwin.pm
  M config/init/hints/darwin.pm
  M config/init/hints/mswin32.pm
  M docs/book/draft/ch10_opcode_reference.pod
  M docs/book/pir/ch04_variables.pod
  M docs/configuration.pod
  M docs/parrothist.pod
  M docs/project/release_manager_guide.pod
  A docs/project/release_parrot_github_guide.pod
  M examples/sdl/tetris/block.pir
  M examples/sdl/tetris/board.pir
  M ext/nqp-rx/src/stage0/HLL-s0.pir
  M ext/nqp-rx/src/stage0/Regex-s0.pir
  M ext/winxed/compiler.pir
  M ext/winxed/driver.pir
  M frontend/parrot/main.c
  M frontend/parrot2/build.pir
  M frontend/parrot2/main.c
  M frontend/parrot_debugger/main.c
  M frontend/pbc_disassemble/main.c
  M frontend/pbc_dump/main.c
  M include/parrot/api.h
  M include/parrot/call.h
  M include/parrot/hash.h
  M include/parrot/interpreter.h
  M include/parrot/memory.h
  M include/parrot/oplib/core_ops.h
  M include/parrot/oplib/ops.h
  M include/parrot/opsenum.h
  M include/parrot/packfile.h
  M include/parrot/parrot.h
  M include/parrot/pmc.h
  M include/parrot/pointer_array.h
  M include/parrot/scheduler.h
  M include/parrot/sub.h
  M lib/Parrot/Docs/HTMLPage.pm
  M lib/Parrot/Pmc2c/PMC.pm
  M lib/Parrot/Pmc2c/PMC/default.pm
  M runtime/parrot/library/P6object.pir
  M runtime/parrot/library/SDL/Surface.pir
  M runtime/parrot/library/Stream/Writer.pir
  M runtime/parrot/library/osutils.pir
  M runtime/parrot/library/parrotlib.pir
  M src/alarm.c
  M src/call/context.c
  M src/call/ops.c
  M src/debug.c
  M src/dynext.c
  M src/dynpmc/gziphandle.pmc
  M src/dynpmc/os.pmc
  M src/embed/api.c
  M src/events.c
  M src/gc/gc_gms.c
  M src/gc/gc_ms2.c
  M src/gc/mark_sweep.c
  M src/gc/string_gc.c
  M src/global_setup.c
  M src/hash.c
  M src/interp/api.c
  M src/interp/inter_cb.c
  M src/nci/libffi.c
  M src/ops/core.ops
  M src/ops/core_ops.c
  M src/ops/experimental.ops
  M src/ops/object.ops
  M src/ops/pmc.ops
  M src/ops/set.ops
  M src/ops/string.ops
  M src/packfile/api.c
  R src/packfile/byteorder.h
  M src/packfile/output.c
  M src/packfile/pf_items.c
  M src/packfile/pf_private.h
  M src/packfile/segments.c
  M src/platform/generic/socket.c
  M src/pmc.c
  M src/pmc/callcontext.pmc
  M src/pmc/class.pmc
  M src/pmc/continuation.pmc
  M src/pmc/coroutine.pmc
  M src/pmc/default.pmc
  M src/pmc/fixedbooleanarray.pmc
  M src/pmc/fixedstringarray.pmc
  M src/pmc/hashiterator.pmc
  M src/pmc/imageiofreeze.pmc
  M src/pmc/imccompiler.pmc
  M src/pmc/nativepccmethod.pmc
  M src/pmc/nci.pmc
  M src/pmc/parrotinterpreter.pmc
  M src/pmc/parrotlibrary.pmc
  M src/pmc/resizablebooleanarray.pmc
  M src/pmc/resizablefloatarray.pmc
  M src/pmc/resizableintegerarray.pmc
  M src/pmc/resizablepmcarray.pmc
  M src/pmc/stringbuilder.pmc
  M src/pmc/sub.pmc
  M src/pmc/undef.pmc
  M src/pmc/unmanagedstruct.pmc
  M src/pointer_array.c
  M src/runcore/cores.c
  M src/runcore/profiling.c
  M src/runcore/subprof.c
  M src/scheduler.c
  M src/spf_render.c
  M src/string/api.c
  M src/vtable.tbl
  M t/codingstd/c_arg_assert.t
  M t/compilers/imcc/syn/const.t
  M t/compilers/imcc/syn/pcc.t
  M t/dynpmc/foo-02.t
  A t/native_pbc/annotations.pbc
  M t/native_pbc/integer.pbc
  M t/native_pbc/number.pbc
  M t/native_pbc/number_4.pbc
  M t/native_pbc/number_5.pbc
  M t/native_pbc/string.pbc
  M t/native_pbc/string_4.pbc
  A t/native_pbc/string_5.pbc
  M t/op/gc.t
  M t/pmc/freeze.t
  M t/pmc/namespace.t
  M t/pmc/object-meths.t
  M t/pmc/prop.t
  M t/src/checkdepend.t
  M t/src/extend_vtable.t
  M t/steps/auto/icu-01.t
  M tools/build/parrot_config_c.pl
  M tools/dev/faces.pl
  A tools/dev/new_changelog_skeleton.pl
  M tools/dev/pbc_to_exe.pir
  M tools/docs/mk_html_docs.pl
  M tools/release/release.json
  M tools/release/update_version.pl

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

Conflicts:
	src/gc/gc_ms2.c
	src/scheduler.c





More information about the parrot-commits mailing list