diff options
| author | K. Handa | 2015-01-07 22:51:41 +0900 |
|---|---|---|
| committer | K. Handa | 2015-01-07 22:51:41 +0900 |
| commit | 88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf (patch) | |
| tree | 18da116400703b67738bdbbd38cc4abf4c1e929f /src/ChangeLog.12 | |
| parent | 3f79d3131629f73da16ec121d2a0056f11b70e65 (diff) | |
| parent | 95295df44cc2b6e0e2442aeff96b0fe2ceac405c (diff) | |
| download | emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.tar.gz emacs-88bc8332eb14bcc4780fd3fe3dd4de2205c31dbf.zip | |
Merge branch master of git.sv.gnu.org:/srv/git/emacs.
Diffstat (limited to 'src/ChangeLog.12')
| -rw-r--r-- | src/ChangeLog.12 | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/ChangeLog.12 b/src/ChangeLog.12 index 80d7460c734..78b903e9d0e 100644 --- a/src/ChangeLog.12 +++ b/src/ChangeLog.12 | |||
| @@ -2327,7 +2327,7 @@ | |||
| 2327 | 2327 | ||
| 2328 | 2012-12-08 Fabrice Popineau <fabrice.popineau@gmail.com> | 2328 | 2012-12-08 Fabrice Popineau <fabrice.popineau@gmail.com> |
| 2329 | 2329 | ||
| 2330 | * w32fns.c (emacs_abort): Don't do arithmetics on void pointers. | 2330 | * w32fns.c (emacs_abort): Don't do arithmetic on void pointers. |
| 2331 | 2331 | ||
| 2332 | 2012-12-08 Eli Zaretskii <eliz@gnu.org> | 2332 | 2012-12-08 Eli Zaretskii <eliz@gnu.org> |
| 2333 | 2333 | ||
| @@ -4716,7 +4716,7 @@ | |||
| 4716 | defining an XRectangle structure. | 4716 | defining an XRectangle structure. |
| 4717 | 4717 | ||
| 4718 | * w32proc.c (RVA_TO_PTR, w32_executable_type): Fix pointer | 4718 | * w32proc.c (RVA_TO_PTR, w32_executable_type): Fix pointer |
| 4719 | arithmetics for compatibility with x64. | 4719 | arithmetic for compatibility with x64. |
| 4720 | 4720 | ||
| 4721 | * w32menu.c (add_menu_item): Use UINT_PTR instead of UINT, for | 4721 | * w32menu.c (add_menu_item): Use UINT_PTR instead of UINT, for |
| 4722 | compatibility with x64. | 4722 | compatibility with x64. |
| @@ -22936,7 +22936,7 @@ See ChangeLog.11 for earlier changes. | |||
| 22936 | ;; coding: utf-8 | 22936 | ;; coding: utf-8 |
| 22937 | ;; End: | 22937 | ;; End: |
| 22938 | 22938 | ||
| 22939 | Copyright (C) 2011-2014 Free Software Foundation, Inc. | 22939 | Copyright (C) 2011-2015 Free Software Foundation, Inc. |
| 22940 | 22940 | ||
| 22941 | This file is part of GNU Emacs. | 22941 | This file is part of GNU Emacs. |
| 22942 | 22942 | ||