Source Mage code commit list

[Vlad Glagolev <scm AT sourcemage.org>]

GIT changes to master grimoire by Vlad Glagolev <stealth AT sourcemage.org>:

 perl-cpan/archive-tar/CONFLICTS  |    1 +
 perl-cpan/archive-tar/HISTORY    |    3 +++
 perl-cpan/test-harness/CONFLICTS |    1 +
 perl-cpan/test-harness/HISTORY   |    3 +++
 perl-cpan/test-simple/CONFLICTS  |    1 +
 perl-cpan/test-simple/HISTORY    |    3 +++
 6 files changed, 12 insertions(+)

New commits:
commit 037b74e82db525f9ab047c63e91eeed27f8b6b9a
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    archive-tar: conflicts with modern perl

commit 16dd83bd1563d5aac6d8ce14429309fc04b2e9d6
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    test-harness: conflicts with modern perl

commit d796456b6383257e5f868033929c984696b3426f
Author: Vlad Glagolev <stealth AT sourcemage.org>
Commit: Vlad Glagolev <stealth AT sourcemage.org>

    test-simple: conflicts with modern perl

diff --git a/perl-cpan/archive-tar/CONFLICTS b/perl-cpan/archive-tar/CONFLICTS
new file mode 100755
index 0000000..9ae5303
--- /dev/null
+++ b/perl-cpan/archive-tar/CONFLICTS
@@ -0,0 +1 @@
+conflicts perl y
diff --git a/perl-cpan/archive-tar/HISTORY b/perl-cpan/archive-tar/HISTORY
index 3bcd5ac..78bd97c 100644
--- a/perl-cpan/archive-tar/HISTORY
+++ b/perl-cpan/archive-tar/HISTORY
@@ -1,3 +1,6 @@
+2015-05-01 Vlad Glagolev <stealth AT sourcemage.org>
+       * CONFLICTS: added, included with perl core since 5.10.0
+
 2008-01-07 Vlad Glagolev <stealth AT sourcemage.org>
        * DETAILS: cleaned up, updated to 1.38
        * BUILD, CONFLICTS: useless
diff --git a/perl-cpan/test-harness/CONFLICTS 
b/perl-cpan/test-harness/CONFLICTS
new file mode 100755
index 0000000..9ae5303
--- /dev/null
+++ b/perl-cpan/test-harness/CONFLICTS
@@ -0,0 +1 @@
+conflicts perl y
diff --git a/perl-cpan/test-harness/HISTORY b/perl-cpan/test-harness/HISTORY
index 0327d5d..f3ac3f0 100644
--- a/perl-cpan/test-harness/HISTORY
+++ b/perl-cpan/test-harness/HISTORY
@@ -1,3 +1,6 @@
+2015-05-01 Vlad Glagolev <stealth AT sourcemage.org>
+       * CONFLICTS: added, included with perl core since 5.8.1
+
 2008-01-07 Vlad Glagolev <stealth AT sourcemage.org>
        * BUILD: useless
 
diff --git a/perl-cpan/test-simple/CONFLICTS b/perl-cpan/test-simple/CONFLICTS
new file mode 100755
index 0000000..9ae5303
--- /dev/null
+++ b/perl-cpan/test-simple/CONFLICTS
@@ -0,0 +1 @@
+conflicts perl y
diff --git a/perl-cpan/test-simple/HISTORY b/perl-cpan/test-simple/HISTORY
index 970b345..47f8f05 100644
--- a/perl-cpan/test-simple/HISTORY
+++ b/perl-cpan/test-simple/HISTORY
@@ -1,3 +1,6 @@
+2015-05-01 Vlad Glagolev <stealth AT sourcemage.org>
+       * CONFLICTS: added, included with perl core since 5.8
+
 2013-05-11 Florian Franzmann <siflfran AT hawo.stw.uni-erlangen.de>
        * DETAILS: version 0.98_05