]> gitweb.factorcode.org Git - factor.git/commit
Merge branch 'master' of git://factorcode.org/git/factor
authorAnton Gorenko <ex.rzrjck@gmail.com>
Sun, 26 Sep 2010 17:24:30 +0000 (23:24 +0600)
committerAnton Gorenko <ex.rzrjck@gmail.com>
Sun, 26 Sep 2010 17:24:30 +0000 (23:24 +0600)
commitd5a7f99bea930a7633655565331740c5492b9ede
tree7ba1d4baed0b975755845756066164e20697a98b
parent58ab818708127f74c509727642413fa00f1748aa
parent2d3c9fd7c8f20d24642479f32f751fc97da14bcc
Merge branch 'master' of git://factorcode.org/git/factor

Conflicts:
basis/cairo/ffi/ffi.factor
basis/pango/cairo/cairo.factor
basis/pango/layouts/layouts.factor