Merge from trunk.

[gnu-emacs] / src / ChangeLog

diff --git a/src/ChangeLog b/src/ChangeLog
index c431eb1e7b23e0cffee4705201971623777e4672..78ab05728c6782dc986eccefc503b576e0ecba9b 100644 (file)
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-25  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Use gnulib's dup2 module instead of rolling our own.
+       * sysdep.c (dup2) [!HAVE_DUP2]: Remove; gnulib now does this.
+
 2011-06-25  YAMAMOTO Mitsuharu  <mituharu@math.s.chiba-u.ac.jp>
 
        * dispnew.c (scrolling_window): Before scrolling, turn off a