[parrot/parrot] 50d7ba: fix conflicts in api.yaml. There's plenty of room ...

[noreply at github.com]

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

  Commit: 50d7baf59a5d553c29fffe9a4a1266cf6f6801bd
      https://github.com/parrot/parrot/commit/50d7baf59a5d553c29fffe9a4a1266cf6f6801bd
  Author: Whiteknight <wknight8111 at gmail.com>
  Date:   2011-07-07 (Thu, 07 Jul 2011)

  Changed paths:
    M MANIFEST
  M MANIFEST.generated
  M api.yaml
  M config/gen/makefiles/root.in
  M frontend/pbc_merge/main.c
  M include/parrot/packfile.h
  M src/embed.c
  M src/embed/bytecode.c
  M src/packfile/api.c
  M src/packfile/output.c
  A src/packfile/pf_private.h
  A src/packfile/segments.c
  M src/pmc/eval.pmc
  M src/pmc/imccompiler.pmc
  M src/pmc/packfile.pmc
  A src/pmc/packfileview.pmc
  M src/pmc/parrotinterpreter.pmc
  A t/pmc/packfileview.t
  M t/pmc/parrotinterpreter.t

  Log Message:
  -----------
  fix conflicts in api.yaml. There's plenty of room to deprecate everything