Merge from emacs-23.

[gnu-emacs] / ChangeLog

diff --git a/ChangeLog b/ChangeLog
index b3b3b999dc9d3bd124dc6586376cd2a54687a7a9..0ff3459d66b7a4822367715872f914703cba1b9d 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-01-25  Peter O'Gorman  <bug-gnu-emacs@mlists.thewrittenword.com>  (tiny change)
+
+       * configure.in: Add HP-UX on IA64 (Bug#6811).
+
 2011-01-24  Paul Eggert  <eggert@cs.ucla.edu>
 
        Remove HAVE_RAW_DECL_CHOWN etc. from config.h