Mercurial > emacs
diff lisp/ediff-wind.el @ 108502:9914f26982b7
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Tue, 11 May 2010 22:45:13 +0000 |
parents | 1d1d5d9bd884 |
children | 376148b31b5e |
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Tue, 11 May 2010 22:45:13 +0000 |
parents | 1d1d5d9bd884 |
children | 376148b31b5e |