merge trunk

1 files changed, 6 insertions, 1 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index a3536cda7a4..642445b2328 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,4 +1,4 @@
-2011-07-06  Kenichi Handa  <handa@m17n.org>
+2011-07-07  Kenichi Handa  <handa@m17n.org>
 
         * character.h (unicode_category_t): New enum type.
 
@@ -40,6 +40,11 @@
         * font.c (font_range): Adjusted for the change of
         Vunicode_category_table.
 
+2011-07-07  Dan Nicolaescu  <dann@ics.uci.edu>
+
+        * m/iris4d.h: Remove file, move contents ...
+        * s/irix6-5.h: ... here.
+
 2011-07-06  Paul Eggert  <eggert@cs.ucla.edu>
 
         Remove unportable assumption about struct layout (Bug#8884).