[parrot/parrot] 3c927a: Merge remote branch 'origin/master' into mls/kill-...

noreply at github.com noreply at github.com
Wed Nov 16 14:23:43 UTC 2011


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

  Commit: 3c927aced47b8ee3e4dad6980aef87c15508d254
      https://github.com/parrot/parrot/commit/3c927aced47b8ee3e4dad6980aef87c15508d254
  Author: Michael Schroeder <mls at suse.de>
  Date:   2011-11-16 (Wed, 16 Nov 2011)

  Changed paths:
    M CREDITS
  M ChangeLog
  M MANIFEST.generated
  M README
  M VERSION
  M compilers/opsc/src/Ops/Compiler/Actions.pm
  M compilers/opsc/src/Ops/Compiler/Grammar.pm
  M docs/parrothist.pod
  M docs/project/release_manager_guide.pod
  M ext/winxed/compiler.pir
  M ext/winxed/driver.pir
  M frontend/pbc_dump/packdump.c
  M include/parrot/oplib/core_ops.h
  M include/parrot/pmc.h
  M runtime/parrot/library/Test/Builder.pir
  M src/call/args.c
  M src/call/pcc.c
  M src/dynpmc/select.pmc
  M src/ops/core.ops
  M src/ops/core_ops.c
  M src/pmc/callcontext.pmc
  M src/pmc/coroutine.pmc
  M src/pmc/sub.pmc
  M src/pmc/task.pmc
  M t/fullharness
  M t/op/calling.t
  M t/pmc/alarm.t
  M t/pmc/task.t
  M t/pmc/task_primes.t
  M tools/release/release.json

  Log Message:
  -----------
  Merge remote branch 'origin/master' into mls/kill-events-in-ehqueue

Conflicts:
	src/ops/core_ops.c


  Commit: be7897f82dc50eb8a9e27afe0b32d2d221982e8e
      https://github.com/parrot/parrot/commit/be7897f82dc50eb8a9e27afe0b32d2d221982e8e
  Author: Michael Schroeder <mls at suse.de>
  Date:   2011-11-16 (Wed, 16 Nov 2011)

  Changed paths:
    M compilers/pct/src/PAST/Compiler.pir
  M config/gen/makefiles/root.in
  M include/parrot/events.h
  M include/parrot/exceptions.h
  M include/parrot/oplib/core_ops.h
  M include/parrot/oplib/ops.h
  M include/parrot/opsenum.h
  M src/events.c
  M src/extend.c
  M src/key.c
  M src/ops/core.ops
  M src/ops/core_ops.c
  M src/pmc/coroutine.pmc
  M src/pmc/exception.pmc
  M src/pmc/exceptionhandler.pmc
  M src/pmc/parrotinterpreter.pmc
  M src/pmc/sub.pmc
  M src/string/api.c
  M t/compilers/opsc/06-opsfile.t
  M t/pmc/exceptionhandler.t

  Log Message:
  -----------
  Merge branch 'mls/kill-events-in-ehqueue'


Compare: https://github.com/parrot/parrot/compare/777824a...be7897f


More information about the parrot-commits mailing list