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 5f120fb43a2..f82a5174179 100644
--- a/ChangeLog.MELT
+++ b/ChangeLog.MELT
@@ -1,4 +1,8 @@
+2013-02-08 Basile Starynkevitch <basile@starynkevitch.net>
+
+ MELT branch merged with trunk rev 195888 using svnmerge.py
+
2013-02-05 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 195751 using svnmerge.py