Mercurial > hg > xemacs-beta
annotate nt/xemacs.dsw @ 2146:e4307a6b9ebb
[xemacs-hg @ 2004-06-21 18:26:18 by adrian]
[R21.4] [PATCH] xemacs-21.5: Fix false cvs conflict in lisp/package-ui.el
-------------------- ChangeLog entries follow: --------------------
lisp/ChangeLog addition:
2004-06-21 Adrian Aichner <adrian@xemacs.org>
* package-ui.el (pui-help-echo): Fix false cvs conflict by
avoiding line solely composed of equal signs.
author | adrian |
---|---|
date | Mon, 21 Jun 2004 18:26:18 +0000 |
parents | abe6d1db359e |
children | 2a199f37e01f |
rev | line source |
---|---|
442 | 1 Microsoft Developer Studio Workspace File, Format Version 6.00 |
2 # WARNING: DO NOT EDIT OR DELETE THIS WORKSPACE FILE! | |
3 | |
4 ############################################################################### | |
5 | |
6 Project: "xemacs"=.\xemacs.dsp - Package Owner=<4> | |
7 | |
8 Package=<5> | |
9 {{{ | |
10 }}} | |
11 | |
12 Package=<4> | |
13 {{{ | |
14 }}} | |
15 | |
16 ############################################################################### | |
17 | |
18 Global: | |
19 | |
20 Package=<5> | |
21 {{{ | |
22 }}} | |
23 | |
24 Package=<3> | |
25 {{{ | |
26 }}} | |
27 | |
28 ############################################################################### | |
29 |