diff options
author | Glenn Morris <rgm@gnu.org> | 2012-12-30 10:09:01 -0800 |
---|---|---|
committer | Glenn Morris <rgm@gnu.org> | 2012-12-30 10:09:01 -0800 |
commit | d5e5e7b41166815a843148f2081d19bc14b628b2 (patch) | |
tree | 6afd575b3a741ce26e5ec1e2665d45dfab8cbb52 /ChangeLog | |
parent | 4f752957f174b5ab95ef6b9428669b1b1ecf0bab (diff) | |
parent | 5c560880659048888420389c02e20d6867ec81df (diff) | |
download | emacs-d5e5e7b41166815a843148f2081d19bc14b628b2.tar.gz |
Merge from emacs-24; up to 2012-12-05T00:13:56Z!yamaoka@jpl.org
Diffstat (limited to 'ChangeLog')
-rw-r--r-- | ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 9623763b950..c26d1605497 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2012-12-30 Andreas Schwab <schwab@linux-m68k.org> + + * configure.ac (TEMACS_LDFLAGS2): Don't define. + (LIBS_GNUSTEP): Set for GNUstep and substitute. + (LD_SWITCH_SYSTEM_TEMACS): Don't set for GNUstep. + 2012-12-27 Glenn Morris <rgm@gnu.org> * configure.ac (emacs_config_options): New. |