Merge from emacs-24; up to 2012-12-06T20:16:38Z!monnier@iro.umontreal.ca

[bpt/emacs.git] / admin / ChangeLog

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 840c38a..fa001ed 100644 (file)
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,23 @@
+2013-01-03  Glenn Morris  <rgm@gnu.org>
+
+       * check-doc-strings: Update for CVS->bzr, moved lispref/ directory.
+
+       * emacs-pretesters, make-announcement, make-changelog-diff:
+       Remove files.
+
+2012-12-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Fix permissions bugs with setgid directories etc. (Bug#13125)
+       * CPP-DEFINES (BSD4_2): Remove.
+
+2012-12-08  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Use putenv+unsetenv instead of modifying environ directly (Bug#13070).
+       * merge-gnulib (GNULIB_MODULES): Add putenv, unsetenv.
+
+       Simplify get_lim_data.
+       * CPP-DEFINES (ULIMIT_BREAK_VALUE): Remove.
+
 2012-12-03  Paul Eggert  <eggert@cs.ucla.edu>
 
        Assume POSIX 1003.1-1988 or later for signal.h (Bug#13026).
@@ -1652,7 +1672,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 2001-2012 Free Software Foundation, Inc.
+  Copyright (C) 2001-2013 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.