Skip to Content.
Sympa Menu

sm-commit - [SM-Commit] GIT changes to master grimoire by Robin Cook (33f09b5d900bf4bd0b30acde4248a541af053035)

sm-commit AT lists.ibiblio.org

Subject: Source Mage code commit list

List archive

Chronological Thread  
  • From: Robin Cook <scm AT sourcemage.org>
  • To: sm-commit AT lists.ibiblio.org
  • Subject: [SM-Commit] GIT changes to master grimoire by Robin Cook (33f09b5d900bf4bd0b30acde4248a541af053035)
  • Date: Sun, 17 Jun 2012 18:24:38 -0500

GIT changes to master grimoire by Robin Cook <rcook AT wyrms.net>:

java/icedtea6/CONFLICTS | 3 ++-
java/icedtea6/HISTORY | 3 +++
2 files changed, 5 insertions(+), 1 deletion(-)

New commits:
commit 33f09b5d900bf4bd0b30acde4248a541af053035
Author: Robin Cook <rcook AT wyrms.net>
Commit: Robin Cook <rcook AT wyrms.net>

icedtea6: added icedtea7 to CONFLICTS

diff --git a/java/icedtea6/CONFLICTS b/java/icedtea6/CONFLICTS
index 0e66666..4729bad 100755
--- a/java/icedtea6/CONFLICTS
+++ b/java/icedtea6/CONFLICTS
@@ -3,4 +3,5 @@ conflicts j2sdk-bin &&
conflicts jre1.5-bin &&
conflicts jre6-bin &&
conflicts jdk1.5-bin &&
-conflicts jdk6-bin
+conflicts jdk6-bin &&
+conflicts icedtea7
diff --git a/java/icedtea6/HISTORY b/java/icedtea6/HISTORY
index 3cea0fa..e1a02a1 100644
--- a/java/icedtea6/HISTORY
+++ b/java/icedtea6/HISTORY
@@ -1,3 +1,6 @@
+2012-06-18 Robin Cook <rcook AT wyrms.net>
+ * CONFLICTS: added icedtea7
+
2012-06-17 Robin Cook <rcook AT wyrms.net>
* PROVIDES: added ICEDTEA




  • [SM-Commit] GIT changes to master grimoire by Robin Cook (33f09b5d900bf4bd0b30acde4248a541af053035), Robin Cook, 06/17/2012

Archive powered by MHonArc 2.6.24.

Top of Page