diff options
| author | Miles Bader | 2000-10-10 02:32:57 +0000 |
|---|---|---|
| committer | Miles Bader | 2000-10-10 02:32:57 +0000 |
| commit | 10e5ab47673405960c83a866d96fcecbc4522a8b (patch) | |
| tree | e8d2447e6c8a001a35f32e8c679f68e04ee659a1 | |
| parent | e10ae834bc2faf1ab859f72cb1f867db1f489cad (diff) | |
| download | emacs-10e5ab47673405960c83a866d96fcecbc4522a8b.tar.gz emacs-10e5ab47673405960c83a866d96fcecbc4522a8b.zip | |
Remove CVS merge cookie left in.
| -rw-r--r-- | src/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 5dc70468f4d..c8ba96834d3 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -33,7 +33,6 @@ | |||
| 33 | (syms_of_msdos): Don't intern and don't staticpro | 33 | (syms_of_msdos): Don't intern and don't staticpro |
| 34 | Qbackground_color and Qforeground_color. | 34 | Qbackground_color and Qforeground_color. |
| 35 | 35 | ||
| 36 | >>>>>>> 1.946 | ||
| 37 | 2000-10-07 Eli Zaretskii <eliz@is.elta.co.il> | 36 | 2000-10-07 Eli Zaretskii <eliz@is.elta.co.il> |
| 38 | 37 | ||
| 39 | * frame.c (Fframe_parameter): For non-windowed frames, if | 38 | * frame.c (Fframe_parameter): For non-windowed frames, if |