diff options
| author | John Paul Wallington | 2005-12-14 22:59:35 +0000 |
|---|---|---|
| committer | John Paul Wallington | 2005-12-14 22:59:35 +0000 |
| commit | eb2def1bc68f04e7feebe8e5d45503d8d807f5b0 (patch) | |
| tree | 7291eee539a3cf1bef44a2201297e94025e5345a /src | |
| parent | 6d298e78a21d8cc7bde58c57c83e900cff351f72 (diff) | |
| download | emacs-eb2def1bc68f04e7feebe8e5d45503d8d807f5b0.tar.gz emacs-eb2def1bc68f04e7feebe8e5d45503d8d807f5b0.zip | |
*** empty log message ***
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 369846e302d..1010b03814c 100644 --- a/src/ChangeLog +++ b/src/ChangeLog | |||
| @@ -15,7 +15,6 @@ | |||
| 15 | 15 | ||
| 16 | * coding.c (code_convert_region_unwind): GCPRO arg. | 16 | * coding.c (code_convert_region_unwind): GCPRO arg. |
| 17 | 17 | ||
| 18 | >>>>>>> 1.4762 | ||
| 19 | 2005-12-12 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> | 18 | 2005-12-12 Jan Dj,Ad(Brv <jan.h.d@swipnet.se> |
| 20 | 19 | ||
| 21 | * xfns.c (compute_tip_xy): Calculate root_y the same way as root_x, | 20 | * xfns.c (compute_tip_xy): Calculate root_y the same way as root_x, |