summaryrefslogtreecommitdiff
path: root/ChangeLog.MELT
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog.MELT')
-rw-r--r--ChangeLog.MELT4
1 files changed, 4 insertions, 0 deletions
diff --git a/ChangeLog.MELT b/ChangeLog.MELT
index 49fb5f8b4c6..396745aaab6 100644
--- a/ChangeLog.MELT
+++ b/ChangeLog.MELT
@@ -1,4 +1,8 @@
+2012-02-22 Basile Starynkevitch <basile@starynkevitch.net>
+
+ MELT branch merged with trunk rev 184458 using svnmerge
+
2012-02-20 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 184385 using svnmerge