]> gitweb.factorcode.org Git - factor.git/commit
Merge branch 'gtk' into gtk-image-loader
authorPhilipp Brüschweiler <blei42@gmail.com>
Thu, 22 Jul 2010 21:51:17 +0000 (23:51 +0200)
committerPhilipp Brüschweiler <blei42@gmail.com>
Thu, 22 Jul 2010 21:51:17 +0000 (23:51 +0200)
commit926d1540c5d2d0314eb369781d92000da611a18f
treef5a5ab869d7faee0decaf74720df51eb428d3148
parent39d475e9969a6ae3a15c8300d31fadbe17b79996
parent832b55fe89deefd5790c6bc9073d33ddd269d145
Merge branch 'gtk' into gtk-image-loader

Conflicts:
basis/glib/ffi/ffi.factor
basis/ui/backend/gtk/gtk.factor
basis/glib/ffi/ffi.factor
basis/ui/backend/gtk/gtk.factor