summaryrefslogtreecommitdiff
path: root/ChangeLog.MELT
diff options
context:
space:
mode:
Diffstat (limited to 'ChangeLog.MELT')
-rw-r--r--ChangeLog.MELT5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog.MELT b/ChangeLog.MELT
index 86ad7a5949f..7bf9d85d3e3 100644
--- a/ChangeLog.MELT
+++ b/ChangeLog.MELT
@@ -1,4 +1,9 @@
+2011-06-20 Basile Starynkevitch <basile@starynkevitch.net>
+
+ MELT branch merged with trunk rev 175225 using svnmerge. Using
+ c_register_pragma_with_expansion_and_data is now possible...
+
2011-06-11 Basile Starynkevitch <basile@starynkevitch.net>
MELT branch merged with trunk rev 174941 using svnmerge