aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog.11
diff options
context:
space:
mode:
authorPaul Eggert2012-04-21 17:53:32 -0700
committerPaul Eggert2012-04-21 17:53:32 -0700
commitbbd347f5f7e99da1a559dad818b5fa8f59c0901e (patch)
tree77c1fc54c2240b08d2859109d18cac8812a8ffb1 /src/ChangeLog.11
parente4ecdc9c71af4199129d5dd2db1a32ff6b725fe4 (diff)
parent9ee7d8b93cb143b473e6dffb708e777bc6fe5bd0 (diff)
downloademacs-bbd347f5f7e99da1a559dad818b5fa8f59c0901e.tar.gz
emacs-bbd347f5f7e99da1a559dad818b5fa8f59c0901e.zip
Merge from trunk.
Diffstat (limited to 'src/ChangeLog.11')
-rw-r--r--src/ChangeLog.112
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11
index 97d5a65281a..781027ee8ae 100644
--- a/src/ChangeLog.11
+++ b/src/ChangeLog.11
@@ -9641,7 +9641,7 @@
9641 9641
96422010-03-12 Eli Zaretskii <eliz@gnu.org> 96422010-03-12 Eli Zaretskii <eliz@gnu.org>
9643 9643
9644 These changes remove termcap.c from the build on Posix platforms. 9644 These changes remove termcap.c from the build on POSIX platforms.
9645 * Makefile.in (termcapobj): Move termcap.o from here... 9645 * Makefile.in (termcapobj): Move termcap.o from here...
9646 (MSDOS_OBJ): ...to here. 9646 (MSDOS_OBJ): ...to here.
9647 (termcapobj) [!LIBS_TERMCAP]: Remove specialized value, as it is 9647 (termcapobj) [!LIBS_TERMCAP]: Remove specialized value, as it is