aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorKenichi Handa2010-05-27 16:08:37 +0900
committerKenichi Handa2010-05-27 16:08:37 +0900
commit478ebb73bb3b80bf2a0a55081f9753639d98fd4a (patch)
treeb6348bdf7c6f583c7bf3f7793e460cec50d64c8a /src/ChangeLog
parent2b25da455e14b3712f544ebf7fb1c83d17353130 (diff)
parentb7bd84780e8a409dd1df344a5c6a78339b183d26 (diff)
downloademacs-478ebb73bb3b80bf2a0a55081f9753639d98fd4a.tar.gz
emacs-478ebb73bb3b80bf2a0a55081f9753639d98fd4a.zip
merge trunk
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog16
1 files changed, 16 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index d451e873adb..d7128960af7 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,19 @@
12010-05-27 Glenn Morris <rgm@gnu.org>
2
3 * Makefile.in, autodeps.mk, deps.mk, ns.mk:
4 Convert comments to Makefile format.
5
6 * Makefile.in (bootstrap-clean): No more Makefile.c.
7
82010-05-26 Glenn Morris <rgm@gnu.org>
9
10 * Makefile.in (YMF_PASS_LDFLAGS): Remove.
11 (temacs${EXEEXT}): Use PRE_EDIT_LDFLAGS, POST_EDIT_LDFLAGS.
12
13 * Makefile.in (NS_IMPL_GNUSTEP_INC, NS_IMPL_GNUSTEP_TEMACS_LDFLAGS):
14 Remove.
15 (TEMACS_LDFLAGS): Do not use NS_IMPL_GNUSTEP_TEMACS_LDFLAGS.
16
12010-05-26 Kenichi Handa <handa@m17n.org> 172010-05-26 Kenichi Handa <handa@m17n.org>
2 18
3 * composite.c (composition_compute_stop_pos): Fix condition for 19 * composite.c (composition_compute_stop_pos): Fix condition for