diff options
| author | Joakim Verona | 2013-09-13 08:11:34 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-09-13 08:11:34 +0200 |
| commit | 584bb3a913701a6324d020c87a39e03828fa0bd1 (patch) | |
| tree | 9a474d375f7b784ad76afb1ea4a09b8ef176dda9 /src/ChangeLog | |
| parent | 4f6e32297ee0536354c3261027f6c65586c646f0 (diff) | |
| parent | 35c3d36e0ed6c7f5104946dd966ca46d0495f640 (diff) | |
| download | emacs-584bb3a913701a6324d020c87a39e03828fa0bd1.tar.gz emacs-584bb3a913701a6324d020c87a39e03828fa0bd1.zip | |
merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index f08395ae24f..960165a22f9 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,14 @@ | |||
| 1 | 2013-09-13 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | * xterm.h (x_window_to_frame, x_any_window_to_frame) | ||
| 4 | (x_menubar_window_to_frame): Remove prototypes. | ||
| 5 | * xfns.c (x_window_to_frame, x_any_window_to_frame) | ||
| 6 | (x_menubar_window_to_frame, x_top_window_to_frame): | ||
| 7 | Move from here... | ||
| 8 | * xterm.c (x_window_to_frame, x_any_window_to_frame) | ||
| 9 | (x_menubar_window_to_frame, x_top_window_to_frame): | ||
| 10 | ...to here and convert all but the last to static. | ||
| 11 | |||
| 1 | 2013-09-12 Eli Zaretskii <eliz@gnu.org> | 12 | 2013-09-12 Eli Zaretskii <eliz@gnu.org> |
| 2 | 13 | ||
| 3 | * lisp.mk (lisp): Add w32-common-fns.elc. | 14 | * lisp.mk (lisp): Add w32-common-fns.elc. |