summaryrefslogtreecommitdiff
path: root/ChangeLog.melt
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog.melt')
-rw-r--r--ChangeLog.melt3
1 files changed, 3 insertions, 0 deletions
diff --git a/ChangeLog.melt b/ChangeLog.melt
index b04f9120b2f..6e01186bd4b 100644
--- a/ChangeLog.melt
+++ b/ChangeLog.melt
@@ -1,3 +1,6 @@
+2008-05-21 Basile Starynkevitch <basile@starynkevitch.net>
+ MELT branch merged with trunk r135714
+
2008-05-17 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk r135459