Merge commit 'ae006838093cfeb67b3818526622fb5cb61d5300' of git://github.com/scymtym...

author Olof-Joachim Frahm <olof@macrolet.net>

Sun, 26 Aug 2012 13:32:23 +0000 (15:32 +0200)

committer Olof-Joachim Frahm <olof@macrolet.net>

Sun, 26 Aug 2012 13:32:23 +0000 (15:32 +0200)
author Olof-Joachim Frahm <olof@macrolet.net>
Sun, 26 Aug 2012 13:32:23 +0000 (15:32 +0200)
committer Olof-Joachim Frahm <olof@macrolet.net>
Sun, 26 Aug 2012 13:32:23 +0000 (15:32 +0200)
diff --cc generating.lisp
Simple merge
diff --cc gtk/cl-gtk2-gtk.asd
Simple merge
author	Olof-Joachim Frahm <olof@macrolet.net>
	Sun, 26 Aug 2012 13:32:23 +0000 (15:32 +0200)
committer	Olof-Joachim Frahm <olof@macrolet.net>
	Sun, 26 Aug 2012 13:32:23 +0000 (15:32 +0200)
		1	2
generating.lisp	patch \|	diff1 \|	diff2 \|	blob \| history
gtk/cl-gtk2-gtk.asd	patch \|	diff1 \|	diff2 \|	blob \| history