diff options
| author | Xue Fuqiao | 2013-07-30 08:29:09 +0800 |
|---|---|---|
| committer | Xue Fuqiao | 2013-07-30 08:29:09 +0800 |
| commit | d2067333246b676fcf98567d34eec79ed4648d5f (patch) | |
| tree | ad6543d8e7f1db50226907f7278373eef544d252 /lisp/ChangeLog.15 | |
| parent | 7aa7fff0c8860b72a2c7cdc7d4d0845245754d43 (diff) | |
| parent | 86b192c1479d167c13edb9cdaa026c231c8a0442 (diff) | |
| download | emacs-d2067333246b676fcf98567d34eec79ed4648d5f.tar.gz emacs-d2067333246b676fcf98567d34eec79ed4648d5f.zip | |
Merge from mainline.
Diffstat (limited to 'lisp/ChangeLog.15')
| -rw-r--r-- | lisp/ChangeLog.15 | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/lisp/ChangeLog.15 b/lisp/ChangeLog.15 index 4d0ff9a40e2..afa2bce104e 100644 --- a/lisp/ChangeLog.15 +++ b/lisp/ChangeLog.15 | |||
| @@ -5119,7 +5119,7 @@ | |||
| 5119 | (x-setup-function-keys, xw-defined-colors): Merge x- and w32- | 5119 | (x-setup-function-keys, xw-defined-colors): Merge x- and w32- |
| 5120 | definitions here. | 5120 | definitions here. |
| 5121 | 5121 | ||
| 5122 | 2010-10-24 T.V. Raman <tv.raman.tv@gmail.com> (tiny change) | 5122 | 2010-10-24 T. V. Raman <tv.raman.tv@gmail.com> (tiny change) |
| 5123 | 5123 | ||
| 5124 | * net/mairix.el (mairix-searches-mode-map): | 5124 | * net/mairix.el (mairix-searches-mode-map): |
| 5125 | * mail/mspools.el (mspools-mode-map): Fix 2010-10-10 change. | 5125 | * mail/mspools.el (mspools-mode-map): Fix 2010-10-10 change. |