[parrot/parrot] afda97: Merge branch 'master' of git://github.com/bacek/YA...

noreply at github.com noreply at github.com
Wed Feb 2 04:27:53 UTC 2011


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

Commit: afda976d5e2b145c1a0d16b29ef47581214750d6
    https://github.com/parrot/parrot/commit/afda976d5e2b145c1a0d16b29ef47581214750d6
Author: Christoph Otto <christoph_git at mksig.org>
Date:   2011-02-01 (Tue, 01 Feb 2011)

Changed paths:
  A Makefile
  A lib/YAML/Tiny.pm
  A t/01-compile.t
  A t/02_basic.t
  A t/lib/Test.pm

Log Message:
-----------
Merge branch 'master' of git://github.com/bacek/YAML--Tiny into yaml-tiny-import

Conflicts:
	README


Commit: 1429108956cbeaa04dc365ec367847eb5b400882
    https://github.com/parrot/parrot/commit/1429108956cbeaa04dc365ec367847eb5b400882
Author: Christoph Otto <christoph_git at mksig.org>
Date:   2011-02-01 (Tue, 01 Feb 2011)

Changed paths:
  R Makefile
  R lib/YAML/Tiny.pm
  A runtime/parrot/library/YAML/Tiny.pm
  R t/01-compile.t
  R t/02_basic.t
  R t/lib/Test.pm
  A t/library/yaml_tiny.t

Log Message:
-----------
shuffle files around, move yaml_ok into yaml_tiny.t


Commit: d3f892122a88366b9c84da94b0140ff95d4ac814
    https://github.com/parrot/parrot/commit/d3f892122a88366b9c84da94b0140ff95d4ac814
Author: Christoph Otto <christoph_git at mksig.org>
Date:   2011-02-01 (Tue, 01 Feb 2011)

Changed paths:
  M config/gen/makefiles/root.in

Log Message:
-----------
update makefile template for YAML::Tiny


Commit: ee1f42bd2b1a01e478aeb78d6d753b62bcc10636
    https://github.com/parrot/parrot/commit/ee1f42bd2b1a01e478aeb78d6d753b62bcc10636
Author: Christoph Otto <christoph_git at mksig.org>
Date:   2011-02-01 (Tue, 01 Feb 2011)

Changed paths:
  M config/gen/makefiles/root.in
  M t/library/yaml_tiny.t

Log Message:
-----------
fix makefile template, add magic to make test pass


Commit: ed5319afc61c83a2a5acb38048f23070fe1f92e2
    https://github.com/parrot/parrot/commit/ed5319afc61c83a2a5acb38048f23070fe1f92e2
Author: Christoph Otto <christoph_git at mksig.org>
Date:   2011-02-01 (Tue, 01 Feb 2011)

Changed paths:
  A tools/dev/show_experimental.nqp

Log Message:
-----------
add show_experimental.nqp from bacek++


Commit: d775ac6e5e45d95a390ace41b517f26a8583728a
    https://github.com/parrot/parrot/commit/d775ac6e5e45d95a390ace41b517f26a8583728a
Author: Christoph Otto <christoph_git at mksig.org>
Date:   2011-02-01 (Tue, 01 Feb 2011)

Changed paths:
  M t/library/yaml_tiny.t

Log Message:
-----------
add a test to parse api.yaml


Commit: b04920bbdd1b28c9e2ff17c1c073649c3990e885
    https://github.com/parrot/parrot/commit/b04920bbdd1b28c9e2ff17c1c073649c3990e885
Author: Christoph Otto <christoph_git at mksig.org>
Date:   2011-02-01 (Tue, 01 Feb 2011)

Changed paths:
  M api.yaml

Log Message:
-----------
fix eligibility good in api.yaml


Commit: 78dfa4daf2475acd66e4e6d91a336a3d29194a1b
    https://github.com/parrot/parrot/commit/78dfa4daf2475acd66e4e6d91a336a3d29194a1b
Author: Christoph Otto <christoph_git at mksig.org>
Date:   2011-02-01 (Tue, 01 Feb 2011)

Changed paths:
  M tools/dev/show_experimental.nqp

Log Message:
-----------
add a fix mentioned by bacek++


Commit: 87a5cc11e60254b90db2d1e6287f60c937b903f4
    https://github.com/parrot/parrot/commit/87a5cc11e60254b90db2d1e6287f60c937b903f4
Author: Christoph Otto <christoph_git at mksig.org>
Date:   2011-02-01 (Tue, 01 Feb 2011)

Changed paths:
  A tools/dev/show_deprecated.nqp

Log Message:
-----------
add nqp port of show_deprecated


Commit: 96eb8d0634858161c2a4e91525c4728b248b0cc2
    https://github.com/parrot/parrot/commit/96eb8d0634858161c2a4e91525c4728b248b0cc2
Author: Christoph Otto <christoph_git at mksig.org>
Date:   2011-02-01 (Tue, 01 Feb 2011)

Changed paths:
  R t/tools/show_deprecated.t
  R t/tools/show_experimental.t
  R tools/dev/show_deprecated.pl
  R tools/dev/show_experimental.pl

Log Message:
-----------
remove perl versions of show_* and tests


Commit: 86347b1355c61ca7623dde2b29b06e52dc417089
    https://github.com/parrot/parrot/commit/86347b1355c61ca7623dde2b29b06e52dc417089
Author: Christoph Otto <christoph_git at mksig.org>
Date:   2011-02-01 (Tue, 01 Feb 2011)

Changed paths:
  M MANIFEST

Log Message:
-----------
manifix




More information about the parrot-commits mailing list