diff options
| author | Eli Zaretskii | 2014-10-14 21:10:37 +0300 |
|---|---|---|
| committer | Eli Zaretskii | 2014-10-14 21:10:37 +0300 |
| commit | e3060a0c4d2f418ac786775109d71e5843ccf42e (patch) | |
| tree | 347b37fc39d0db9cd23b3e9f79ee81b4bbc40f08 /src/ChangeLog.11 | |
| parent | 1a3eca0656bdb764200e10a4f264138e94b1f3ce (diff) | |
| parent | 980d78b3587560c13a46aef352ed8d5ed744acf6 (diff) | |
| download | emacs-e3060a0c4d2f418ac786775109d71e5843ccf42e.tar.gz emacs-e3060a0c4d2f418ac786775109d71e5843ccf42e.zip | |
Merge from trunk and resolve conflicts.
Diffstat (limited to 'src/ChangeLog.11')
| -rw-r--r-- | src/ChangeLog.11 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/ChangeLog.11 b/src/ChangeLog.11 index ac886d38966..fc6ff1fda6a 100644 --- a/src/ChangeLog.11 +++ b/src/ChangeLog.11 | |||
| @@ -2241,7 +2241,7 @@ | |||
| 2241 | * xdisp.c (try_scrolling): Avoid infloop if the first line is | 2241 | * xdisp.c (try_scrolling): Avoid infloop if the first line is |
| 2242 | obscured due to a vscroll (Bug#7537). | 2242 | obscured due to a vscroll (Bug#7537). |
| 2243 | 2243 | ||
| 2244 | 2010-12-13 Jan Djärv <jhd@zeplinf.localdomain> | 2244 | 2010-12-13 Jan Djärv <jan.h.d@swipnet.se> |
| 2245 | 2245 | ||
| 2246 | * nsterm.h (FRAME_NS_TOOLBAR_HEIGHT): Rename to FRAME_TOOLBAR_HEIGHT. | 2246 | * nsterm.h (FRAME_NS_TOOLBAR_HEIGHT): Rename to FRAME_TOOLBAR_HEIGHT. |
| 2247 | 2247 | ||