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 c2fa0944f68..96d38e40636 100644
--- a/ChangeLog.MELT
+++ b/ChangeLog.MELT
@@ -1,4 +1,8 @@
+2012-10-31 Basile Starynkevitch <basile@starynkevitch.net>
+
+ MELT branch merged with trunk rev 193029 using svnmerge.py
+
2012-10-25 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 192797 using svnmerge.py