diff options
| author | Jan Djärv | 2014-11-01 21:06:49 +0100 |
|---|---|---|
| committer | Jan Djärv | 2014-11-01 21:06:49 +0100 |
| commit | bf7ded963c672f858c3b4c14d2cd8278b0d781c4 (patch) | |
| tree | eed47f19f62d898a3a3a58029b8e9f3082c5e7d9 /src/ChangeLog | |
| parent | d5d8ca30e5f481a32414c42bcc3b5a042061ff07 (diff) | |
| download | emacs-bf7ded963c672f858c3b4c14d2cd8278b0d781c4.tar.gz emacs-bf7ded963c672f858c3b4c14d2cd8278b0d781c4.zip | |
Clean up merge conflict.
* macfont.m (macfont_draw):
* nsterm.m (ns_mouse_position, judge): Clean up merge conflict.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 4fb50118444..e79bcb7080a 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,5 +1,8 @@ | |||
| 1 | 2014-11-01 Jan Djärv <jan.h.d@swipnet.se> | 1 | 2014-11-01 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 2 | ||
| 3 | * macfont.m (macfont_draw): | ||
| 4 | * nsterm.m (ns_mouse_position, judge): Clean up merge conflict. | ||
| 5 | |||
| 3 | * macfont.m (macfont_glyph_extents): Turn off synthetic bold | 6 | * macfont.m (macfont_glyph_extents): Turn off synthetic bold |
| 4 | if force_integral_p (i.e. no antialias). | 7 | if force_integral_p (i.e. no antialias). |
| 5 | (macfont_draw): Check ns_antialias_text, also turn off synthetic | 8 | (macfont_draw): Check ns_antialias_text, also turn off synthetic |