diff options
| author | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-14 20:53:29 -0800 |
|---|---|---|
| committer | Paul Eggert <eggert@cs.ucla.edu> | 2011-02-14 20:53:29 -0800 |
| commit | bb55f713d2e4ea089a861a257d7d000432642ce9 (patch) | |
| tree | 92cf79666025c70a6541e87cb47ab8299c5f92af /ChangeLog | |
| parent | 8017fd6b81ed07c1ff3adf7494c867f9a2b034a9 (diff) | |
| download | emacs-bb55f713d2e4ea089a861a257d7d000432642ce9.tar.gz | |
Merge from gnulib.
Diffstat (limited to 'ChangeLog')
| -rw-r--r-- | ChangeLog | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog index 9dcdff187a5..e5b3b2e8b08 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,19 @@ +2011-02-15 Paul Eggert <eggert@cs.ucla.edu> + + Merge from gnulib. + + 2011-02-13 Bruno Haible <bruno@clisp.org> + + Consistent macro naming for macros that use GCC __attribute__. + * lib/ignore-value.h (_GL_ATTRIBUTE_DEPRECATED): Renamed from + ATTRIBUTE_DEPRECATED. + + 2011-02-12 Bruno Haible <bruno@clisp.org> + + setlocale: Prefer gnulib's override over libintl's override. + * lib/gettext.h (setlocale): Redefine to rpl_setlocale if + GNULIB_defined_setlocale is set. + 2011-02-13 Glenn Morris <rgm@gnu.org> * make-dist: Exclude generated file src/globals.h. |