Merge branch 'master' of git://github.com/andy128k/cl-gtk2 into gdk-pixbuf
authorOlof-Joachim Frahm <Olof.Frahm@web.de>
Thu, 4 Nov 2010 03:33:31 +0000 (04:33 +0100)
committerOlof-Joachim Frahm <Olof.Frahm@web.de>
Thu, 4 Nov 2010 03:33:31 +0000 (04:33 +0100)
Conflicts:
gtk/gtk.main_loop_events.lisp

1  2 
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))