merge master

[gnu-emacs] / leim / ChangeLog

diff --git a/leim/ChangeLog b/leim/ChangeLog
index ac698f63e713bbc7aa5374198fab9d899f2994ef..4bda9a64335e682946bc133a8b545a122b27377a 100644 (file)
--- a/leim/ChangeLog
+++ b/leim/ChangeLog
@@ -1,3 +1,20 @@
+2015-01-04  Paul Eggert  <eggert@cs.ucla.edu>
+
+       Less 'make' chatter for leim
+       * Makefile.in (AM_DEFAULT_VERBOSITY, AM_V_GEN, am__v_GEN_)
+       (am__v_GEN_0, am__v_GEN_1, AM_V_at, am__v_at_, am__v_at_0)
+       (am__v_at_1): New macros, from src/Makefile.in.
+       (${leimdir}/quail/%.el, misc_convert, ${leimdir}/leim-list.el)
+       (${leimdir}/ja-dic/ja-dic.el): Use them.
+
+2014-12-14  Paul Eggert  <eggert@cs.ucla.edu>
+
+       * SKK-DIC/SKK-JISYO.L: Update to version 1.1216.
+
+2014-10-20  Glenn Morris  <rgm@gnu.org>
+
+       * Merge in all changes up to 24.4 release.
+
 2014-06-10  Glenn Morris  <rgm@gnu.org>
 
        Use GNU Make features to simplify and parallelize.
@@ -2554,7 +2571,7 @@
 ;; coding: utf-8
 ;; End:
 
-  Copyright (C) 1997-1999, 2001-2014 Free Software Foundation, Inc.
+  Copyright (C) 1997-1999, 2001-2015 Free Software Foundation, Inc.
 
   This file is part of GNU Emacs.