[parrot/parrot] 6eb1de: fix conflict

noreply at github.com noreply at github.com
Sat Apr 23 21:38:56 UTC 2011


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

Commit: 6eb1def92ac97fd7b87dae93c77961ffa1c023ab
    https://github.com/parrot/parrot/commit/6eb1def92ac97fd7b87dae93c77961ffa1c023ab
Author: Whiteknight <wknight8111 at gmail.com>
Date:   2011-04-23 (Sat, 23 Apr 2011)

Changed paths:
  M compilers/pct/src/PAST/Compiler.pir
  M runtime/parrot/library/Archive/Tar.pir
  M runtime/parrot/library/Archive/Zip.pir
  M runtime/parrot/library/HTTP/Message.pir
  M runtime/parrot/library/LWP/Protocol.pir
  M runtime/parrot/library/LWP/UserAgent.pir
  M runtime/parrot/library/NCI/Utils.pir
  M runtime/parrot/library/Stream/Sub.pir
  M runtime/parrot/library/Stream/Writer.pir
  M runtime/parrot/library/TAP/Harness.pir
  M runtime/parrot/library/TAP/Parser.pir
  M src/dynoplibs/io.ops
  M src/dynoplibs/trans.ops
  M src/embed.c
  M src/ops/core.ops
  M src/ops/math.ops
  M src/ops/object.ops
  M src/ops/set.ops
  M src/ops/var.ops

Log Message:
-----------
fix conflict


Commit: 327b110f8a58ab0e09627fb6e82e7f87fa93f934
    https://github.com/parrot/parrot/commit/327b110f8a58ab0e09627fb6e82e7f87fa93f934
Author: Whiteknight <wknight8111 at gmail.com>
Date:   2011-04-23 (Sat, 23 Apr 2011)

Changed paths:
  M lib/Parrot/Pmc2c/Emitter.pm

Log Message:
-----------
remove #line directives from pmc2c. They serve no positive purpose that I can think of, they make debugging significantly more difficult, and they don't always disappear when I configure with --no-line-directives


Commit: 1cd8ab2c48fe35a695fb815a1a3644bfdeea20f7
    https://github.com/parrot/parrot/commit/1cd8ab2c48fe35a695fb815a1a3644bfdeea20f7
Author: Whiteknight <wknight8111 at gmail.com>
Date:   2011-04-23 (Sat, 23 Apr 2011)

Changed paths:
  M t/src/extend_vtable.t

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


Compare: https://github.com/parrot/parrot/compare/7413e30...1cd8ab2


More information about the parrot-commits mailing list