From: Olof-Joachim Frahm <Olof.Frahm@web.de>
Date: Thu, 4 Nov 2010 03:33:31 +0000 (+0100)
Subject: Merge branch 'master' of git://github.com/andy128k/cl-gtk2 into gdk-pixbuf
X-Git-Url: http://repo.macrolet.net/gitweb/?p=cl-gtk2.git;a=commitdiff_plain;h=074a6bd691acf2adf73cab8ef434a056c927b33b

Merge branch 'master' of git://github.com/andy128k/cl-gtk2 into gdk-pixbuf

Conflicts:
	gtk/gtk.main_loop_events.lisp
---

074a6bd691acf2adf73cab8ef434a056c927b33b
diff --cc gtk/gtk.main_loop_events.lisp
index d3abfde,909967c..4bac720
--- a/gtk/gtk.main_loop_events.lisp
+++ b/gtk/gtk.main_loop_events.lisp
@@@ -84,4 -84,4 +84,4 @@@
  (defcfun gtk-grab-get-current g-object)
  
  (defcfun gtk-grab-remove :void
--  (widget g-object))
++  (widget g-object))