[slime-cvs] CVS slime/contrib

[CVS User heller]

Update of /project/slime/cvsroot/slime/contrib
In directory cl-net:/tmp/cvs-serv19541/contrib

Modified Files:
	ChangeLog 
Log Message:
Fix automatic merge.

--- /project/slime/cvsroot/slime/contrib/ChangeLog	2008/12/31 11:25:22	1.157
+++ /project/slime/cvsroot/slime/contrib/ChangeLog	2008/12/31 11:25:46	1.158
@@ -1,3 +1,9 @@
+2008-12-31  Helmut Eller  <heller at common-lisp.net>
+
+	* inferior-slime.el (inferior-slime-change-directory): New
+	function.
+	(inferior-slime-init): Hook it in.
+
 2008-12-30  Tobias C. Rittweiler  <tcr at freebits.de>
 
 	* slime-repl.lisp (slime-repl-set-package): Set
@@ -29,12 +35,6 @@
 	operator name as first argument if point is located at the
 	operator name.
 
-2008-12-31  Helmut Eller  <heller at common-lisp.net>
-
-	* inferior-slime.el (inferior-slime-change-directory): New
-	function.
-	(inferior-slime-init): Hook it in.
-
 2008-12-27  Helmut Eller  <heller at common-lisp.net>
 
 	* slime-repl.el (slime-repl-event-hook-function): Handle