aboutsummaryrefslogtreecommitdiffstats
path: root/src/ChangeLog
diff options
context:
space:
mode:
authorGlenn Morris2010-05-17 20:03:14 -0700
committerGlenn Morris2010-05-17 20:03:14 -0700
commit9539dc5db33befba5aaed2bfa9e38d67a599d9f5 (patch)
treec838f463317cb2f3b67a677103ee013cd5b74ca0 /src/ChangeLog
parent7b570c766f1125f96c095a75cb90ca26f264a377 (diff)
downloademacs-9539dc5db33befba5aaed2bfa9e38d67a599d9f5.tar.gz
emacs-9539dc5db33befba5aaed2bfa9e38d67a599d9f5.zip
* s/gnu-linux.h: Combine two conditionals.
Diffstat (limited to 'src/ChangeLog')
-rw-r--r--src/ChangeLog4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog
index 0a649d56815..f271c52907c 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,6 +1,8 @@
12010-05-18 Glenn Morris <rgm@gnu.org> 12010-05-18 Glenn Morris <rgm@gnu.org>
2 2
3 * Makefile.in (otherobj): Include $(VMLIMIT_OBJ) seperately from 3 * s/gnu-linux.h: Combine two conditionals.
4
5 * Makefile.in (otherobj): Include $(VMLIMIT_OBJ) separately from
4 $(POST_ALLOC_OBJ). 6 $(POST_ALLOC_OBJ).
5 7
6 * Makefile.in (RALLOC_OBJ): New, set by configure. 8 * Makefile.in (RALLOC_OBJ): New, set by configure.