From 2d56a84ec8f4717d0aa891278c9a80efd9951af1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Fredrik=20H=C3=BCbinette=20=28Hubbe=29?= <hubbe@hubbe.net>
Date: Tue, 3 Dec 1996 13:54:19 -0800
Subject: [PATCH] conflict resolved, entries added

Rev: src/ChangeLog:1.28
---
 src/ChangeLog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/src/ChangeLog b/src/ChangeLog
index 5b1cc3f5bf..3c50491947 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+Mon Dec  2 17:49:16 1996  Fredrik Hubinette  <hubbe@cytocin.hubbe.net>
+
+	* master.pike: cast_to_object now handles relative paths better
+	* install-sh: now uses autoconf install-sh
+	* callback.c: fix to handle recursive calls (hopefully)
+
 Tue Dec  3 02:53:25 1996  Henrik Grubbstr�m  <grubba@cuckoo.infovav.se>
 
 	* modules/ssleay/configure.in: Made the tests more paranoid
-- 
GitLab