diff options
Diffstat (limited to 'src/ChangeLog')
| -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, |