Mercurial > emacs
comparison etc/NEWS @ 28855:1be9a502caca
Cleaned some left over bogus conflict markers.
author | Stefan Monnier <monnier@iro.umontreal.ca> |
---|---|
date | Wed, 10 May 2000 21:37:06 +0000 |
parents | a5c81109bc31 |
children | b3629cc23098 |
comparison
equal
deleted
inserted
replaced
28854:a5c81109bc31 | 28855:1be9a502caca |
---|---|
1153 interface to access directory servers using different directory | 1153 interface to access directory servers using different directory |
1154 protocols. It has a separate manual. | 1154 protocols. It has a separate manual. |
1155 | 1155 |
1156 *** autoconf.el provides a major mode for editing configure.in files | 1156 *** autoconf.el provides a major mode for editing configure.in files |
1157 for Autoconf, selected automatically. | 1157 for Autoconf, selected automatically. |
1158 <<<<<<< NEWS | |
1159 | |
1160 *** windmove.el | |
1161 ======= | |
1162 | 1158 |
1163 *** windmove.el provides moving between windows. | 1159 *** windmove.el provides moving between windows. |
1164 >>>>>>> 1.127 | 1160 |
1165 | |
1166 <<<<<<< NEWS | |
1167 ======= | |
1168 *** crm.el provides a facility to read multiple strings from the | 1161 *** crm.el provides a facility to read multiple strings from the |
1169 minibuffer with completion. | 1162 minibuffer with completion. |
1170 | 1163 |
1171 >>>>>>> 1.127 | |
1172 ** Withdrawn packages | 1164 ** Withdrawn packages |
1173 | 1165 |
1174 *** mldrag.el has been removed. mouse.el provides the same | 1166 *** mldrag.el has been removed. mouse.el provides the same |
1175 functionality with aliases for the mldrag functions. | 1167 functionality with aliases for the mldrag functions. |
1176 | 1168 |