diff options
| author | Eli Zaretskii | 2013-12-10 19:56:03 +0200 |
|---|---|---|
| committer | Eli Zaretskii | 2013-12-10 19:56:03 +0200 |
| commit | 5bdc6977e3ab4b36646671754098df7e6ab92ad6 (patch) | |
| tree | dc240463c840e49e97c23fb58b9e2b3d4ad1f3f9 /src/ChangeLog | |
| parent | a5c9bbb3413d8eea89cb832040a0ef6cd704dcfe (diff) | |
| parent | e8374b3959e3fc809b7834e3b85245928ae83774 (diff) | |
| download | emacs-5bdc6977e3ab4b36646671754098df7e6ab92ad6.tar.gz emacs-5bdc6977e3ab4b36646671754098df7e6ab92ad6.zip | |
Merge from trunk.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 0970bf62b52..25271d6f6b8 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,16 @@ | |||
| 1 | 2013-12-10 Dmitry Antipov <dmantipov@yandex.ru> | ||
| 2 | |||
| 3 | * xdisp.c (display_tool_bar_line): Don't extend on a previously | ||
| 4 | drawn tool bar items (Bug#16058). | ||
| 5 | * font.c (font_find_for_lface): Ensure SAFE_FREE on return. | ||
| 6 | |||
| 7 | 2013-12-09 Ken Brown <kbrown@cornell.edu> | ||
| 8 | |||
| 9 | * frame.c (get_frame_param): Make extern if HAVE_NTGUI. | ||
| 10 | |||
| 11 | * lisp.h (get_frame_param): Adjust conditions for prototype | ||
| 12 | declaration. | ||
| 13 | |||
| 1 | 2013-12-09 Dmitry Antipov <dmantipov@yandex.ru> | 14 | 2013-12-09 Dmitry Antipov <dmantipov@yandex.ru> |
| 2 | 15 | ||
| 3 | * gtkutil.c (USE_NEW_GTK_FONT_CHOOSER) [HAVE_FREETYPE]: | 16 | * gtkutil.c (USE_NEW_GTK_FONT_CHOOSER) [HAVE_FREETYPE]: |