[parrot/parrot] cc0610: Fixed codigstd tests

[noreply at github.com]

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

Commit: cc0610ab4ec0c4fb214e64d37f1dea13c7d1fa8d
    https://github.com/parrot/parrot/commit/cc0610ab4ec0c4fb214e64d37f1dea13c7d1fa8d
Author: bluescreen10 <dichoso at gmail.com>
Date:   2010-12-18 (Sat, 18 Dec 2010)

Changed paths:
  M MANIFEST
  M compilers/imcc/main.c
  R examples/embed/embedded_pir.c
  R examples/embed/hello_world.pir
  M include/parrot/api.h
  M src/debug.c
  M src/embed/api.c
  M src/embed/embed_private.h
  M src/embed/pmc.c
  M src/embed/strings.c
  M src/exit.c
  M src/gc/api.c
  M src/global_setup.c
  M src/library.c
  M src/longopt.c
  M src/main.c
  M src/pbc_disassemble.c

Log Message:
-----------
Fixed codigstd tests


Commit: 633c302516acdcbbefbafebfebb662e7eaf9fb3e
    https://github.com/parrot/parrot/commit/633c302516acdcbbefbafebfebb662e7eaf9fb3e
Author: bluescreen10 <dichoso at gmail.com>
Date:   2010-12-18 (Sat, 18 Dec 2010)

Changed paths:
  M include/parrot/api.h
  M src/embed/api.c
  M src/embed/pmc.c
  M t/src/embed/pmc.t

Log Message:
-----------
Merged with remote


Commit: 8968f2fa58ea94041b56c8536ee2ee7acfd4b6b9
    https://github.com/parrot/parrot/commit/8968f2fa58ea94041b56c8536ee2ee7acfd4b6b9
Author: Whiteknight <wknight8111 at gmail.com>
Date:   2010-12-19 (Sun, 19 Dec 2010)

Changed paths:
  M MANIFEST
  M compilers/imcc/main.c
  R examples/embed/embedded_pir.c
  R examples/embed/hello_world.pir
  M frontend/parrot/main.c
  M include/parrot/api.h
  M src/debug.c
  M src/embed/api.c
  M src/embed/embed_private.h
  M src/embed/pmc.c
  M src/embed/strings.c
  M src/exit.c
  M src/gc/api.c
  M src/global_setup.c
  M src/library.c
  M src/longopt.c
  M src/pbc_disassemble.c

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