[parrot/parrot] 72f7f5: Merge branch 'master' into nwellnhof/unicode_filen...

noreply at github.com noreply at github.com
Wed Jan 19 18:58:07 UTC 2011


Branch: refs/heads/nwellnhof/unicode_filenames
Home:   https://github.com/parrot/parrot

Commit: 72f7f5a0674eb3c5830169a5066db448e235bdc7
    https://github.com/parrot/parrot/commit/72f7f5a0674eb3c5830169a5066db448e235bdc7
Author: Nick Wellnhofer <wellnhofer at aevum.de>
Date:   2011-01-19 (Wed, 19 Jan 2011)

Changed paths:
  M compilers/imcc/main.c
  M config/gen/makefiles/root.in
  M config/gen/platform/win32/begin.c
  M config/gen/platform/win32/sysmem.c
  M config/init/hints/mswin32.pm
  M docs/pdds/pdd10_embedding.pod
  M docs/project/release_manager_guide.pod
  M examples/benchmarks/fib.py
  M examples/benchmarks/oo1.py
  M examples/benchmarks/oo2.py
  M examples/benchmarks/oo3.py
  M examples/benchmarks/oo4.py
  M examples/benchmarks/oo5.py
  M examples/benchmarks/oo6.py
  M examples/benchmarks/oofib.py
  M examples/benchmarks/vpm.py
  M frontend/parrot/main.c
  M include/parrot/gc_api.h
  M lib/Parrot/Distribution.pm
  M lib/Parrot/Pmc2c/PMCEmitter.pm
  M runtime/parrot/library/distutils.pir
  M src/gc/api.c
  M src/packfile/api.c
  M src/pmc/orderedhash.pmc
  M t/codingstd/copyright.t
  M t/pmc/orderedhash.t
  M t/src/embed/api.t
  M tools/dev/gdb-pp-load.py
  M tools/dev/gdb-pp.py

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

Conflicts:
	compilers/imcc/main.c
	src/packfile/api.c
	t/src/embed/api.t




More information about the parrot-commits mailing list