aboutsummaryrefslogtreecommitdiffstats
path: root/lib-src
diff options
context:
space:
mode:
authorPaul Eggert2011-02-24 22:42:06 -0800
committerPaul Eggert2011-02-24 22:42:06 -0800
commita07b892ff17e95e513c4bfe6e2dd73df1e589bf3 (patch)
treea3d1a40c919618c9a452a405838cff23819777fe /lib-src
parentae0d725005539d9259efac6a81ff8fdd45eb69a6 (diff)
parentb18947669cd182ec8487b317460f6df5878d0f11 (diff)
downloademacs-a07b892ff17e95e513c4bfe6e2dd73df1e589bf3.tar.gz
emacs-a07b892ff17e95e513c4bfe6e2dd73df1e589bf3.zip
Merge from mainline.
Diffstat (limited to 'lib-src')
-rw-r--r--lib-src/ChangeLog2
1 files changed, 1 insertions, 1 deletions
diff --git a/lib-src/ChangeLog b/lib-src/ChangeLog
index fceeaba174c..2c98cdf59a6 100644
--- a/lib-src/ChangeLog
+++ b/lib-src/ChangeLog
@@ -611,7 +611,7 @@
611 autoconf, not cpp. 611 autoconf, not cpp.
612 (ALL_CFLAGS): Use them as make variables. 612 (ALL_CFLAGS): Use them as make variables.
613 613
6142010-04-07 Christoph <cschol2112@googlemail.com> (tiny change) 6142010-04-07 Christoph Scholtes <cschol2112@googlemail.com>
615 615
616 * makefile.w32-in (OTHER_PLATFORM_SUPPORT): Use parenthesis 616 * makefile.w32-in (OTHER_PLATFORM_SUPPORT): Use parenthesis
617 for macros for nmake compatibility. 617 for macros for nmake compatibility.