[parrot/parrot] 3e6bc3: Merge remote branch 'origin/master' into 233/file_...

GitHub noreply at github.com
Sat Jan 21 12:29:41 UTC 2012


  Branch: refs/heads/master
  Home:   https://github.com/parrot/parrot
  Commit: 3e6bc3e3b94076d0c0e49d0eedff8f788fbe851c
      https://github.com/parrot/parrot/commit/3e6bc3e3b94076d0c0e49d0eedff8f788fbe851c
  Author: Jonathan "Duke" Leto <jonathan at leto.net>
  Date:   2012-01-21 (Sat, 21 Jan 2012)

  Changed paths:
    M .gitignore
  M CREDITS
  M ChangeLog
  M MANIFEST
  M MANIFEST.SKIP
  M MANIFEST.generated
  M README
  M RESPONSIBLE_PARTIES
  M TODO
  M VERSION
  M api.yaml
  M compilers/imcc/api.c
  M compilers/opsc/src/Ops/Trans/C.pm
  M config/gen/makefiles/root.in
  M config/init/hints.pm
  M config/init/hints/cygwin.pm
  M docs/book/draft/appe_source_code.pod
  M docs/book/draft/ch01_introduction.pod
  M docs/book/pct/ch01_introduction.pod
  M docs/book/pir/ch01_introduction.pod
  M docs/deprecations/deprecations.pod
  M docs/faq.pod
  M docs/gettingstarted.pod
  M docs/intro.pod
  M docs/parrot.pod
  M docs/parrothist.pod
  M docs/pdds/draft/pdd06_pasm.pod
  M docs/project/cage_cleaners_guide.pod
  M docs/project/metacommitter_guide.pod
  M docs/project/release_manager_guide.pod
  M docs/project/ticket_triaging.pod
  M docs/submissions.pod
  M docs/tests.pod
  M docs/translations/README.BGR
  M docs/translations/README.deutsch
  M docs/translations/README.espanol
  M docs/translations/README.francais
  M docs/translations/README.polski
  M docs/translations/README.pt-BR
  M examples/languages/abc/setup.pir
  M examples/languages/squaak/doc/tutorial_episode_1.pod
  M examples/languages/squaak/doc/tutorial_episode_4.pod
  M examples/languages/squaak/doc/tutorial_episode_5.pod
  M examples/languages/squaak/doc/tutorial_episode_6.pod
  M examples/pir/befunge/setup.pir
  M frontend/parrot_debugger/main.c
  M frontend/pbc_dump/main.c
  M frontend/pbc_merge/main.c
  M include/parrot/interpreter.h
  M include/parrot/oplib/core_ops.h
  M lib/Parrot/Manifest.pm
  M lib/Parrot/Pmc2c/PMC.pm
  M parrotbug
  M runtime/parrot/include/green_threads.pir
  M src/debug.c
  M src/dynoplibs/Rules.in
  M src/dynpmc/Rules.in
  M src/embed/api.c
  M src/exceptions.c
  M src/extend.c
  A src/interp/api.c
  R src/interp/inter_create.c
  R src/interp/inter_misc.c
  M src/ops/core.ops
  M src/ops/core_ops.c
  M src/ops/experimental.ops
  M src/ops/sys.ops
  M src/packfile/api.c
  M src/pmc/arrayiterator.pmc
  M src/pmc/hashiterator.pmc
  M src/pmc/iterator.pmc
  M src/pmc/orderedhashiterator.pmc
  M src/pmc/parrotinterpreter.pmc
  M src/pmc/stringiterator.pmc
  M src/string/api.c
  M t/pmc/exporter.t
  M t/pmc/nci.t
  M t/pmc/timer.t
  M t/src/embed.t
  M t/src/embed/strings.t
  M t/src/exit.t
  M t/src/extend.t
  M t/src/extend_vtable.t
  M t/src/misc.t
  M t/src/pointer_array.t
  M t/src/warnings.t
  M t/tools/install/testlib/README
  M tools/dev/pbc_to_exe.pir
  M tools/release/release.json

  Log Message:
  -----------
  Merge remote branch 'origin/master' into 233/file_based_config


  Commit: d313e63b932aee78c8f2c7ad03d864e5e47c440d
      https://github.com/parrot/parrot/commit/d313e63b932aee78c8f2c7ad03d864e5e47c440d
  Author: jkeenan <jkeenan at cpan.org>
  Date:   2012-01-21 (Sat, 21 Jan 2012)

  Changed paths:
    M Configure.pl
  M MANIFEST
  M examples/config/file/configcompiler
  A examples/config/file/configverbose
  M lib/Parrot/Configure/Options/Conf/File.pm
  M lib/Parrot/Test/Pod.pm
  M t/configure/008-file_based_configuration.t
  R t/configure/testlib/verbosefoobar

  Log Message:
  -----------
  Merge branch '233/file_based_config'


Compare: https://github.com/parrot/parrot/compare/77a5843...d313e63


More information about the parrot-commits mailing list