diff options
| author | Jan Djärv | 2010-01-06 20:42:27 +0100 |
|---|---|---|
| committer | Jan Djärv | 2010-01-06 20:42:27 +0100 |
| commit | 32d59dc3dbdc16c25f1f78659d3167c8f9670868 (patch) | |
| tree | c92352daa9417590a0c6a014d42c0f979b79f23f /src/ChangeLog | |
| parent | b7f8e4f578f593257542d7d05daf7f634e0bdecb (diff) | |
| parent | 474217c83c8a8e07a996ff621ea59f4f472dc340 (diff) | |
| download | emacs-32d59dc3dbdc16c25f1f78659d3167c8f9670868.tar.gz emacs-32d59dc3dbdc16c25f1f78659d3167c8f9670868.zip | |
Merge from trunk
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 795f72b21bd..b7ecf6b7297 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,9 @@ | |||
| 1 | 2010-01-06 David Reitter <david.reitter@gmail.com> | ||
| 2 | |||
| 3 | * nsfns.m (ns_get_screen): Rewrite, returning NULL for non-NS. | ||
| 4 | (Fns_display_usable_bounds): Rewrite, computing bounds properly | ||
| 5 | (Bug#3233). | ||
| 6 | |||
| 1 | 2010-01-06 Jan Djärv <jan.h.d@swipnet.se> | 7 | 2010-01-06 Jan Djärv <jan.h.d@swipnet.se> |
| 2 | 8 | ||
| 3 | * font.c (font_open_entity): Enable chache and call cached_font_ok | 9 | * font.c (font_open_entity): Enable chache and call cached_font_ok |