diff options
| author | Dan Nicolaescu | 2008-09-19 01:35:59 +0000 |
|---|---|---|
| committer | Dan Nicolaescu | 2008-09-19 01:35:59 +0000 |
| commit | d473f8578afab21b7518037a28ea7296c6ee4153 (patch) | |
| tree | caaafd4b254edf5fdb2d63981e36623ad0dcb20b /src | |
| parent | 9d8efa3aab03d7ff64ae19b62cef005a634fedb2 (diff) | |
| download | emacs-d473f8578afab21b7518037a28ea7296c6ee4153.tar.gz emacs-d473f8578afab21b7518037a28ea7296c6ee4153.zip | |
*** empty log message ***
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index e990ac38388..155ed046f77 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -45,7 +45,6 @@ | |||
| 45 | * xmenu.c (menu_position_func): Use x_display_pixel_height and | 45 | * xmenu.c (menu_position_func): Use x_display_pixel_height and |
| 46 | x_display_pixel_width. | 46 | x_display_pixel_width. |
| 47 | 47 | ||
| 48 | >>>>>>> 1.6978 | ||
| 49 | 2008-09-18 Kenichi Handa <handa@m17n.org> | 48 | 2008-09-18 Kenichi Handa <handa@m17n.org> |
| 50 | 49 | ||
| 51 | * composite.c (fill_gstring_header): Don't check FROM and TO here. | 50 | * composite.c (fill_gstring_header): Don't check FROM and TO here. |
| @@ -151,7 +150,6 @@ | |||
| 151 | * indent.c (Fvertical_motion): Be sure to set | 150 | * indent.c (Fvertical_motion): Be sure to set |
| 152 | it_overshoot_expected if it.cmp_it.id is non-nengative. | 151 | it_overshoot_expected if it.cmp_it.id is non-nengative. |
| 153 | 152 | ||
| 154 | >>>>>>> 1.6977 | ||
| 155 | 2008-09-07 Andreas Schwab <schwab@suse.de> | 153 | 2008-09-07 Andreas Schwab <schwab@suse.de> |
| 156 | 154 | ||
| 157 | * callproc.c (Fcall_process): Don't hold references to string data | 155 | * callproc.c (Fcall_process): Don't hold references to string data |