1 files changed, 6 insertions, 0 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index 90d782faa20..b26416b7839 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,7 +1,13 @@
+2005-12-14  Chong Yidong  <cyd@stupidchicken.com>
+
+        * print.c (print_preprocess): Go to a deeper print_depth to avoid
+        print_object loop.
+
 2005-12-14  Kyotaro HORIGUCHI  <horiguti@meadowy.org>  (tiny change)
 
         * coding.c (code_convert_region_unwind): GCPRO arg.
 
+>>>>>>> 1.4762
 2005-12-12  Jan Dj,Ad(Brv  <jan.h.d@swipnet.se>
 
         * xfns.c (compute_tip_xy): Calculate root_y the same way as root_x,