]> gitweb.factorcode.org Git - factor.git/commitdiff
projects / factor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 58ab818 2d3c9fd)
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)
Conflicts:
basis/cairo/ffi/ffi.factor
basis/pango/cairo/cairo.factor
basis/pango/layouts/layouts.factor


Trivial merge
Factor programming language