]> gitweb.factorcode.org Git - factor.git/commit
Merge branch 'master' of git://factorcode.org/git/factor
authorAnton Gorenko <ex.rzrjck@gmail.com>
Mon, 24 May 2010 13:43:05 +0000 (19:43 +0600)
committerAnton Gorenko <ex.rzrjck@gmail.com>
Mon, 24 May 2010 13:43:05 +0000 (19:43 +0600)
commitab9e851bed4b84e29b55d7313918186c05604656
treef077137a2bccda8af4b1e52e7159002689fc812f
parentc6d2f4956a5ef58da7299905ea620c251e1e0106
parent28e67b706658b87c80a5c65614681c094e7cb645
Merge branch 'master' of git://factorcode.org/git/factor

Conflicts:
basis/opengl/gl/extensions/extensions.factor
basis/pango/cairo/cairo.factor
basis/pango/cairo/cairo.factor