]> gitweb.factorcode.org Git - factor.git/commit
Merge branch 'master' of git://factorcode.org/git/factor
authorAnton Gorenko <ex.rzrjck@gmail.com>
Sat, 17 Jul 2010 08:11:06 +0000 (14:11 +0600)
committerAnton Gorenko <ex.rzrjck@gmail.com>
Sat, 17 Jul 2010 08:11:06 +0000 (14:11 +0600)
commit65362a67e8ba54ceb60db72f4d2532bdf80a6e5d
tree964838f5a1f3e317b53b935e69290741623078b6
parentf39f1b22a01d4c4078a9590924d9c71182a6a71f
parente3edb2653d886c55275712f47855de986dc11b7f
Merge branch 'master' of git://factorcode.org/git/factor

Conflicts:
basis/pango/cairo/cairo.factor