Mercurial > emacs
diff lisp/desktop.el @ 108336:d7b6f0f1d150
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sun, 18 Apr 2010 23:14:41 +0000 |
parents | 1d1d5d9bd884 |
children | c56cc351f300 |
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Sun, 18 Apr 2010 23:14:41 +0000 |
parents | 1d1d5d9bd884 |
children | c56cc351f300 |