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 2f6a4ffa574..a707aaeefc4 100644
--- a/ChangeLog.MELT
+++ b/ChangeLog.MELT
@@ -1,4 +1,7 @@
+2009-06-22 Basile Starynkevitch <basile@starynkevitch.net>
+ MELT branch merged with trunk r148777
+
2009-06-18 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk r148653