aboutsummaryrefslogtreecommitdiffstats
path: root/ChangeLog
diff options
context:
space:
mode:
authorPaul Eggert2011-09-28 13:07:17 -0700
committerPaul Eggert2011-09-28 13:07:17 -0700
commitb13f71e2dda86836dc7dea90b385b3791f8ebd01 (patch)
treed15fcbcfb6b94693c2db439828e7daa4e07fe0fc /ChangeLog
parent7b09a37a895ab2d428d1ab0786aa262ef82efba2 (diff)
parente1504b9b0b2fdcf757c29dcc65ffe8b670cc7604 (diff)
downloademacs-b13f71e2dda86836dc7dea90b385b3791f8ebd01.tar.gz
emacs-b13f71e2dda86836dc7dea90b385b3791f8ebd01.zip
Merge from trunk.
Diffstat (limited to 'ChangeLog')
-rw-r--r--ChangeLog5
1 files changed, 5 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index a80fa24c3c2..c1a80f2d92f 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
12011-09-28 Eli Zaretskii <eliz@gnu.org>
2
3 * INSTALL: Mention that m17n libraries and libotf are needed for
4 Arabic shaping.
5
12011-09-26 Paul Eggert <eggert@cs.ucla.edu> 62011-09-26 Paul Eggert <eggert@cs.ucla.edu>
2 7
3 Merge from gnulib, improving some licensing wording. 8 Merge from gnulib, improving some licensing wording.