summaryrefslogtreecommitdiffstats
path: root/java/icedtea6/HISTORY
diff options
context:
space:
mode:
Diffstat (limited to 'java/icedtea6/HISTORY')
-rw-r--r--java/icedtea6/HISTORY3
1 files changed, 3 insertions, 0 deletions
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