[slime-cvs] CVS slime

[CVS User heller]

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

Modified Files:
	ChangeLog 
Log Message:
Fix merge.


--- /project/slime/cvsroot/slime/ChangeLog	2009/01/02 21:58:05	1.1624
+++ /project/slime/cvsroot/slime/ChangeLog	2009/01/02 22:03:27	1.1625
@@ -1,18 +1,3 @@
-2009-01-01  Tobias C. Rittweiler  <tcr at freebits.de>
-
-	Arglists of user-defined types are now displayed by slime-autodoc
-	on SBCL.
-
-	  (deftype foo (x y) `(cons ,x ,y))
-	  (declare (type (foo |
-
-	* swank-sbcl.lisp ([method] type-specifier-arglist): Make use of
-	recently introduced SB-INTROSPECT:DEFTYPE-LAMBDA-LIST.
-
-2009-01-01  Tobias C. Rittweiler  <tcr at freebits.de>
-
-	* swank-loader.lisp (*contribs*): Add `swank-sbcl-exts'.
-
 2009-01-02  Helmut Eller  <heller at common-lisp.net>
 
 	Experimental implementation of "channels".
@@ -36,6 +21,21 @@
 
 2009-01-01  Tobias C. Rittweiler  <tcr at freebits.de>
 
+	Arglists of user-defined types are now displayed by slime-autodoc
+	on SBCL.
+
+	  (deftype foo (x y) `(cons ,x ,y))
+	  (declare (type (foo |
+
+	* swank-sbcl.lisp ([method] type-specifier-arglist): Make use of
+	recently introduced SB-INTROSPECT:DEFTYPE-LAMBDA-LIST.
+
+2009-01-01  Tobias C. Rittweiler  <tcr at freebits.de>
+
+	* swank-loader.lisp (*contribs*): Add `swank-sbcl-exts'.
+
+2009-01-01  Tobias C. Rittweiler  <tcr at freebits.de>
+
 	* slime.el (slime-eval-async, slime-dispatch-event): Canoncalize
 	return value. Previously they returned an arbitrary value which
 	was displayed to the minibuffer due to a bug in slime-autodoc. The