merge trunk

1 files changed, 29 insertions, 0 deletions

diff --git a/admin/ChangeLog b/admin/ChangeLog
index 830854c8e63..221d5c0586c 100644
--- a/admin/ChangeLog
+++ b/admin/ChangeLog
@@ -1,3 +1,32 @@
+2013-05-16  Glenn Morris  <rgm@gnu.org>
+
+        * cus-test.el (cus-test-cus-load-groups): New function.
+        (cus-test-get-options): Add option to return groups.
+        (cus-test-noloads): Also check custom groups.
+
+2013-05-15  Stefan Monnier  <monnier@iro.umontreal.ca>
+
+        * quick-install-emacs: Don't prune DOC-* files a any more.
+
+2013-05-14  Glenn Morris  <rgm@gnu.org>
+
+        * cus-test.el (cus-test-get-lisp-files): Ignore obsolete/.
+        (cus-test-libs): Fix let-binding of default-directory.
+        (cus-test-noloads): Load all libs for the comparison.
+
+2013-05-11  Glenn Morris  <rgm@gnu.org>
+
+        * cus-test.el (cus-test-libs-noloads): Add a few more files.
+        (cus-test-load-libs, cus-test-opts):
+        Add option to load more/all Lisp files.
+        (cus-test-get-lisp-files): Ignore .*.el files.
+
+2013-05-10  Glenn Morris  <rgm@gnu.org>
+
+        * cus-test.el (cus-test-libs-noloads): Add some files.
+        (cus-test-get-lisp-files): New function.
+        (cus-test-libs): Add option to load more/all Lisp files.
+
 2013-05-09  Glenn Morris  <rgm@gnu.org>
 
         * cus-test.el: No need to provide bbdb, bbdb-com any more.