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 72c68b3c0b1..cc90e1310df 100644
--- a/ChangeLog.melt
+++ b/ChangeLog.melt
@@ -1,3 +1,6 @@
+2008-07-15 Basile Starynkevitch <basile@starynkevitch.net>
+ MELT branch merged with trunk r137813
+
2008-07-08 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk r137620