Mercurial > emacs
diff oldXMenu/ChgPane.c @ 43168:3d510ec26d69
fix conflict
author | Per Abrahamsen <abraham@dina.kvl.dk> |
---|---|
date | Thu, 07 Feb 2002 17:33:40 +0000 |
parents | bbce331da1be |
children | 695cf19ef79e d7ddb3e565de |
author | Per Abrahamsen <abraham@dina.kvl.dk> |
---|---|
date | Thu, 07 Feb 2002 17:33:40 +0000 |
parents | bbce331da1be |
children | 695cf19ef79e d7ddb3e565de |