Mercurial > hg > xemacs-beta
changeset 5460:82e220b08ace
Automatic merge.
| author | Stephen J. Turnbull <stephen@xemacs.org> |
|---|---|
| date | Sun, 24 Apr 2011 01:01:34 +0900 |
| parents | 413bf5efaedb (diff) 97968d099404 (current diff) |
| children | 568ec109e73d 248176c74e6b |
| files | |
| diffstat | 1 files changed, 0 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/src/ChangeLog Sat Apr 23 16:24:24 2011 +0100 +++ b/src/ChangeLog Sun Apr 24 01:01:34 2011 +0900 @@ -94,8 +94,6 @@ * unicode.c (Funicode_precedence_list): "occurrance" -> "occurrence". * window.c (struct window_mirror_stats): "Ancilliary" -> "Ancillary". -======= ->>>>>>> other 2011-03-20 Mats Lidell <matsl@xemacs.org> * alloca.c (find_stack_direction):