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

Conflicts:
	gtk/gtk.main_loop_events.lisp

diff --git a/gtk/gtk.main_loop_events.lisp b/gtk/gtk.main_loop_events.lisp
index d3abfde..4bac720 100644 (file)
--- a/gtk/gtk.main_loop_events.lisp
+++ b/gtk/gtk.main_loop_events.lisp
@@ -84,4 +84,4 @@
 (defcfun gtk-grab-get-current g-object)
 
 (defcfun gtk-grab-remove :void
-  (widget g-object))
\ No newline at end of file
+  (widget g-object))