Mercurial > emacs
diff lisp/ediff-wind.el @ 108422:9976fba4d65d
Merge from mainline.
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Wed, 24 Feb 2010 13:25:54 +0000 |
parents | 1d1d5d9bd884 |
children | 376148b31b5e |
author | Katsumi Yamaoka <yamaoka@jpl.org> |
---|---|
date | Wed, 24 Feb 2010 13:25:54 +0000 |
parents | 1d1d5d9bd884 |
children | 376148b31b5e |