Mercurial > emacs
diff oldXMenu/descrip.mms @ 54699:7784ae10206d
Resolve CVS conflicts
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 04 Apr 2004 04:44:10 +0000 |
parents | bbce331da1be |
children | 1e98efa5f4b3 |
author | Miles Bader <miles@gnu.org> |
---|---|
date | Sun, 04 Apr 2004 04:44:10 +0000 |
parents | bbce331da1be |
children | 1e98efa5f4b3 |