[parrot/parrot] 2ceb0e: Merge branch 'master' into nwellnhof/string_unesca...

noreply at github.com noreply at github.com
Tue Dec 28 00:16:45 UTC 2010


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

Commit: 2ceb0e8baecc114d4ea0ac5fc14c9343c09cb4cb
    https://github.com/parrot/parrot/commit/2ceb0e8baecc114d4ea0ac5fc14c9343c09cb4cb
Author: Nick Wellnhofer <wellnhofer at aevum.de>
Date:   2010-12-27 (Mon, 27 Dec 2010)

Changed paths:
  M CREDITS
  M DEPRECATED.pod
  M MANIFEST
  M config/gen/makefiles/root.in
  M config/gen/platform/darwin/sysmem.c
  M docs/project/release_manager_guide.pod
  M include/parrot/dynext.h
  M include/parrot/string_funcs.h
  M src/dynext.c
  M src/embed/pmc.c
  M src/string/api.c
  R t/codingstd/checkdepend.t
  M t/pmc/hash.t
  M t/pmc/hashiterator.t
  M t/pmc/key.t
  A t/src/checkdepend.t
  M t/src/embed/pmc.t
  M t/src/embed/strings.t
  M tools/dev/github_post_receive.pl

Log Message:
-----------
Merge branch 'master' into nwellnhof/string_unescape

Conflicts:
	DEPRECATED.pod


Commit: b8b3c7db92355edece01816c8891208f8c98eefc
    https://github.com/parrot/parrot/commit/b8b3c7db92355edece01816c8891208f8c98eefc
Author: Nick Wellnhofer <wellnhofer at aevum.de>
Date:   2010-12-27 (Mon, 27 Dec 2010)

Changed paths:
  M DEPRECATED.pod
  M MANIFEST
  M compilers/imcc/imcc.y
  M compilers/imcc/imcparser.c
  M compilers/imcc/pbc.c
  M compilers/imcc/symreg.c
  M compilers/imcc/symreg.h
  M config/gen/makefiles/root.in
  M include/parrot/parrot.h
  M include/parrot/string_funcs.h
  R include/parrot/string_primitives.h
  M lib/Parrot/Docs/Section/C.pm
  M src/dynpmc/Defines.in
  M src/string/api.c
  R src/string/primitives.c
  M t/op/stringu.t

Log Message:
-----------
Merge branch 'nwellnhof/string_unescape'




More information about the parrot-commits mailing list