sm-commit AT lists.ibiblio.org
Subject: Source Mage code commit list
List archive
[SM-Commit] GIT changes to master grimoire by Eric Sandall (7ebe14a8f18ace7825d42e82a9c8269a99fdcc1d)
- From: Eric Sandall <scm AT sourcemage.org>
- To: sm-commit AT lists.ibiblio.org
- Subject: [SM-Commit] GIT changes to master grimoire by Eric Sandall (7ebe14a8f18ace7825d42e82a9c8269a99fdcc1d)
- Date: Sun, 12 Sep 2010 23:51:06 -0500
GIT changes to master grimoire by Eric Sandall <sandalle AT sourcemage.org>:
devel/perl/CONFLICTS | 4 ++--
devel/perl/HISTORY | 4 ++++
2 files changed, 6 insertions(+), 2 deletions(-)
New commits:
commit 7ebe14a8f18ace7825d42e82a9c8269a99fdcc1d
Author: Eric Sandall <sandalle AT sourcemage.org>
Commit: Eric Sandall <sandalle AT sourcemage.org>
perl: Auto-conflict with archive-{zip,tar}
as they are now included in perl 5.12+
diff --git a/devel/perl/CONFLICTS b/devel/perl/CONFLICTS
index ded792b..6563d71 100755
--- a/devel/perl/CONFLICTS
+++ b/devel/perl/CONFLICTS
@@ -1,3 +1,3 @@
conflicts module-build y &&
-conflicts archive-tar &&
-conflicts archive-zip
+conflicts archive-tar y &&
+conflicts archive-zip y
diff --git a/devel/perl/HISTORY b/devel/perl/HISTORY
index a6e3f84..258482a 100644
--- a/devel/perl/HISTORY
+++ b/devel/perl/HISTORY
@@ -1,3 +1,7 @@
+2010-09-12 Eric Sandall <sandalle AT sourcemage.org>
+ * CONFLICTS: Auto-conflict with archive-{zip,tar} as they are now
+ included in perl 5.12+
+
2010-09-08 Treeve Jelbert <treeve AT sourcemage.org>
* DETAILS: version 5.12.2
- [SM-Commit] GIT changes to master grimoire by Eric Sandall (7ebe14a8f18ace7825d42e82a9c8269a99fdcc1d), Eric Sandall, 09/13/2010
Archive powered by MHonArc 2.6.24.