diff options
| author | Joakim Verona | 2013-08-13 17:51:59 +0200 |
|---|---|---|
| committer | Joakim Verona | 2013-08-13 17:51:59 +0200 |
| commit | cb0b8a957cbf53f35179f571841c8cda2c276959 (patch) | |
| tree | c8a3461021c1248c6db451d2b65a4712a125140b /src/ChangeLog | |
| parent | cc446d1a2479b155892fc03f58ff433e46a680fa (diff) | |
| parent | 96311be7a6d096a22574caceab652a04f918d479 (diff) | |
| download | emacs-cb0b8a957cbf53f35179f571841c8cda2c276959.tar.gz emacs-cb0b8a957cbf53f35179f571841c8cda2c276959.zip | |
merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index dd6a2cc6283..70a1fa28db5 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,9 @@ | |||
| 1 | 2013-08-13 Jan Djärv <jan.h.d@swipnet.se> | 1 | 2013-08-13 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 2 | ||
| 3 | * nsterm.m (ns_set_vertical_scroll_bar): Fix breakage intruduced by | ||
| 4 | 2013-08-13 checkin below. Change bool to BOOL, rule is: | ||
| 5 | All Obj-C code uses BOOL, except for interfaces callable from C. | ||
| 6 | |||
| 3 | * nsterm.h: Fix CGFloat for OSX 10.4 (Bug#15086). | 7 | * nsterm.h: Fix CGFloat for OSX 10.4 (Bug#15086). |
| 4 | 8 | ||
| 5 | 2013-08-13 Dmitry Antipov <dmantipov@yandex.ru> | 9 | 2013-08-13 Dmitry Antipov <dmantipov@yandex.ru> |