1 files changed, 16 insertions, 0 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 0c3bbf93873..e3b35906ace 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,19 @@
+2012-06-13  Andreas Schwab  <schwab@linux-m68k.org>
+
+        * make-emacs: Rename --union-type to --check-lisp-type.  Define
+        CHECK_LISP_OBJECT_TYPE insted of USE_LISP_UNION_TYPE.
+        * CPP-DEFINES (DEBUG_LISP_OBJECT_TYPE): Renamed from
+        USE_LISP_UNION_TYPE.
+
+2012-06-03  Glenn Morris  <rgm@gnu.org>
+
+        * quick-install-emacs (PUBLIC_LIBSRC_SCRIPTS): Remove rcs-checkin.
+
+2012-06-01  Paul Eggert  <eggert@cs.ucla.edu>
+
+        Remove --disable-maintainer-mode option from 'configure'.  (Bug#11555)
+        * make-tarball.txt: Don't worry about maintainer mode.
+
 2012-05-28  Paul Eggert  <eggert@cs.ucla.edu>
 
         * CPP-DEFINES: Remove HAVE_SYSINFO.