summaryrefslogtreecommitdiffstats
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rwxr-xr-xjava/icedtea6/CONFLICTS3
-rw-r--r--java/icedtea6/HISTORY3
2 files changed, 5 insertions, 1 deletions
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 <rcook@wyrms.net>
+ * CONFLICTS: added icedtea7
+
2012-06-17 Robin Cook <rcook@wyrms.net>
* PROVIDES: added ICEDTEA