]> gitweb.factorcode.org Git - factor.git/commit
Merge branch 'master' of git://factorcode.org/git/factor
authorMatthew Willis <matthew.willis@mac.com>
Fri, 6 Jun 2008 19:17:22 +0000 (12:17 -0700)
committerMatthew Willis <matthew.willis@mac.com>
Fri, 6 Jun 2008 19:17:22 +0000 (12:17 -0700)
commit1f6530b16efe52f4ab3da8449c58a1fc89b176b4
tree79d2a4c8593e134476f921ab4a7b322866778b28
parent07b964fff1f949f9b89c38b4e48cdfa7fe819f65
parenta9509a1f22416854be88afbe37368a9bf90ee7d9
Merge branch 'master' of git://factorcode.org/git/factor

Conflicts:

extra/pango/cairo/gadgets/gadgets.factor