[parrot/parrot] d5b49d: Merge branch 'master' of github.com:parrot/parrot

[noreply at github.com]

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

Commit: d5b49ddc66a49eed1790619a1f82d24d88347e59
    https://github.com/parrot/parrot/commit/d5b49ddc66a49eed1790619a1f82d24d88347e59
Author: Christoph Otto <christoph_github at mksig.org>
Date:   2011-05-14 (Sat, 14 May 2011)

Changed paths:
  M NEWS

Log Message:
-----------
Merge branch 'master' of github.com:parrot/parrot


Commit: 8a1a19e6f1dd7a06ec3244a2dd4deeec04d91f8e
    https://github.com/parrot/parrot/commit/8a1a19e6f1dd7a06ec3244a2dd4deeec04d91f8e
Author: Christoph Otto <christoph_github at mksig.org>
Date:   2011-05-14 (Sat, 14 May 2011)

Changed paths:
  M MANIFEST
  R config/auto/git_describe.pm
  R config/auto/sha1.pm
  M config/gen/config_pm.pm
  M config/gen/config_pm/config_lib_pir.in
  M config/gen/makefiles/root.in
  M lib/Parrot/Configure/Step/List.pm
  M lib/Parrot/Git/Describe.pm
  M lib/Parrot/SHA1.pm
  A t/configure/062-sha1.t
  R t/configure/062-sha1_to_cache.t
  A t/configure/063-git_describe.t
  R t/configure/063-git_describe_to_cache.t
  R t/configure/064-sha1_from_cache.t
  R t/configure/065-git_describe_from_cache.t
  A tools/build/gen_version.pl

Log Message:
-----------
Merge branch 'compiletime-git-describe'


Compare: https://github.com/parrot/parrot/compare/2eb9fb1...8a1a19e