]> code.delx.au - gnu-emacs/commitdiff
delx.au / code / gnu-emacs / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 411c1c6 2566f38)
Merge from origin/emacs-24
authorFabián Ezequiel Gallina <fgallina@gnu.org>
Sat, 27 Dec 2014 16:21:17 +0000 (13:21 -0300)
committerFabián Ezequiel Gallina <fgallina@gnu.org>
Sat, 27 Dec 2014 16:21:17 +0000 (13:21 -0300)
The following commit was skipped:

2566f38 Backport: Don't cache images in nsimage.m (Bug#18918).


Trivial merge