comparison src/ChangeLog @ 5459:413bf5efaedb

Remove leftover conflict markers.
author Stephen J. Turnbull <stephen@xemacs.org>
date Sun, 24 Apr 2011 00:15:47 +0900
parents 4486ba63476b
children 568ec109e73d 248176c74e6b
comparison
equal deleted inserted replaced
5401:4486ba63476b 5459:413bf5efaedb
92 * unexcw.c (copy_executable_and_dump_data_section): "addres" -> 92 * unexcw.c (copy_executable_and_dump_data_section): "addres" ->
93 "address". 93 "address".
94 * unicode.c (Funicode_precedence_list): "occurrance" -> "occurrence". 94 * unicode.c (Funicode_precedence_list): "occurrance" -> "occurrence".
95 * window.c (struct window_mirror_stats): "Ancilliary" -> "Ancillary". 95 * window.c (struct window_mirror_stats): "Ancilliary" -> "Ancillary".
96 96
97 =======
98 >>>>>>> other
99 2011-03-20 Mats Lidell <matsl@xemacs.org> 97 2011-03-20 Mats Lidell <matsl@xemacs.org>
100 98
101 * alloca.c (find_stack_direction): 99 * alloca.c (find_stack_direction):
102 * alloca.c (xemacs_c_alloca): 100 * alloca.c (xemacs_c_alloca):
103 Remove use of auto keyword. It is default and will be illegal in 101 Remove use of auto keyword. It is default and will be illegal in