diff options
| author | Paul Eggert | 2011-09-25 22:52:31 -0700 |
|---|---|---|
| committer | Paul Eggert | 2011-09-25 22:52:31 -0700 |
| commit | 8de9005d3cc8c605efa5a1eb9bef728a09dbde24 (patch) | |
| tree | 5b2551e7f2c7cd5bd2b3bdd31086ea2ad1ecdb3d /src | |
| parent | 856bbc8152110a354293411eac5c629da9f4f74f (diff) | |
| parent | ab22a8a19695ddbb5c5d08cfe4f60e7202072d82 (diff) | |
| download | emacs-8de9005d3cc8c605efa5a1eb9bef728a09dbde24.tar.gz emacs-8de9005d3cc8c605efa5a1eb9bef728a09dbde24.zip | |
Merge from trunk.
Diffstat (limited to 'src')
| -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 6f462e32534..b64736459c8 100644 --- a/src/ChangeLog.11 +++ b/src/ChangeLog.11 | |||
| @@ -2927,7 +2927,7 @@ | |||
| 2927 | * nsimage.m (EmacsImage-setXBMColor:): Correct previous patch: | 2927 | * nsimage.m (EmacsImage-setXBMColor:): Correct previous patch: |
| 2928 | don't change the method signature, change the return. | 2928 | don't change the method signature, change the return. |
| 2929 | 2929 | ||
| 2930 | 2010-11-04 Ismail Donmez <ismail@namtrac.org> (tiny change) | 2930 | 2010-11-04 İsmail Dönmez <ismail@namtrac.org> (tiny change) |
| 2931 | 2931 | ||
| 2932 | * nsfont.m (nsfont_draw) | 2932 | * nsfont.m (nsfont_draw) |
| 2933 | * nsimage.m (EmacsImage-setXBMColor:) | 2933 | * nsimage.m (EmacsImage-setXBMColor:) |