diff options
| author | Chong Yidong | 2012-09-21 11:55:23 +0800 |
|---|---|---|
| committer | Chong Yidong | 2012-09-21 11:55:23 +0800 |
| commit | cc04a16f0c94cc9b0d18d79ead290f12c3cc4f42 (patch) | |
| tree | 863a647210928c3020e0e79019253a38e25fce5f /src/ChangeLog | |
| parent | d3fa327c47570a1767324d23d710504e90b083f9 (diff) | |
| download | emacs-cc04a16f0c94cc9b0d18d79ead290f12c3cc4f42.tar.gz emacs-cc04a16f0c94cc9b0d18d79ead290f12c3cc4f42.zip | |
Backport fix for Bug#12463 from trunk.
* image.c (define_image_type): Avoid adding duplicate types to
image_types. Suggested by Jörg Walter.
Diffstat (limited to 'src/ChangeLog')
| -rw-r--r-- | src/ChangeLog | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index afaa7fd776e..15b47934424 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -1,3 +1,8 @@ | |||
| 1 | 2012-09-21 Chong Yidong <cyd@gnu.org> | ||
| 2 | |||
| 3 | * image.c (define_image_type): Avoid adding duplicate types to | ||
| 4 | image_types (Bug#12463). Suggested by Jörg Walter. | ||
| 5 | |||
| 1 | 2012-09-20 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> | 6 | 2012-09-20 YAMAMOTO Mitsuharu <mituharu@math.s.chiba-u.ac.jp> |
| 2 | 7 | ||
| 3 | * unexmacosx.c: Define LC_DATA_IN_CODE if not defined. | 8 | * unexmacosx.c: Define LC_DATA_IN_CODE if not defined. |