From 33f09b5d900bf4bd0b30acde4248a541af053035 Mon Sep 17 00:00:00 2001 From: Robin Cook Date: Sun, 17 Jun 2012 18:24:02 -0500 Subject: icedtea6: added icedtea7 to CONFLICTS --- java/icedtea6/CONFLICTS | 3 ++- java/icedtea6/HISTORY | 3 +++ 2 files changed, 5 insertions(+), 1 deletion(-) (limited to 'java') diff --git a/java/icedtea6/CONFLICTS b/java/icedtea6/CONFLICTS index 0e66666302..4729bad209 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 3cea0fac38..e1a02a19a7 100644 --- a/java/icedtea6/HISTORY +++ b/java/icedtea6/HISTORY @@ -1,3 +1,6 @@ +2012-06-18 Robin Cook + * CONFLICTS: added icedtea7 + 2012-06-17 Robin Cook * PROVIDES: added ICEDTEA -- cgit v1.2.3