[parrot/parrot] aa5e56: Prevent endless merge conflicts in MANIFEST and MA...

noreply at github.com noreply at github.com
Fri Nov 19 00:13:08 UTC 2010


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

Commit: aa5e5676d0f707fe4a928939b06d37d8c2a7ab44
    https://github.com/parrot/parrot/commit/aa5e5676d0f707fe4a928939b06d37d8c2a7ab44
Author: Jonathan "Duke" Leto <jonathan at leto.net>
Date:   2010-11-18 (Thu, 18 Nov 2010)

Changed paths:
  M MANIFEST
  M lib/Parrot/Manifest.pm

Log Message:
-----------
Prevent endless merge conflicts in MANIFEST and MANIFEST.SKIP, and update them




More information about the parrot-commits mailing list