aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--lisp/ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ChangeLog b/lisp/ChangeLog
index 5fd81d00e2b..e90693180a8 100644
--- a/lisp/ChangeLog
+++ b/lisp/ChangeLog
@@ -123,7 +123,7 @@
123 123
124 * help.el (view-lossage): Doc tweak. 124 * help.el (view-lossage): Doc tweak.
125 125
1262014-04-05 Matthias Dahl <ml_emacs-lists@binary-island.eu> 1262014-04-05 Matthias Dahl <matthias.dahl@binary-island.eu>
127 127
128 * faces.el (face-spec-recalc): Call make-face-x-resource-internal 128 * faces.el (face-spec-recalc): Call make-face-x-resource-internal
129 only when inhibit-x-resources is nil, and do that earlier in the 129 only when inhibit-x-resources is nil, and do that earlier in the