]> gitweb.factorcode.org Git - factor.git/commit
Merge branch 'master' of git://factorcode.org/git/factor
authorJohn Benediktsson <mrjbq7@gmail.com>
Wed, 24 Sep 2008 19:28:22 +0000 (12:28 -0700)
committerJohn Benediktsson <mrjbq7@gmail.com>
Wed, 24 Sep 2008 19:28:22 +0000 (12:28 -0700)
commit744003f53bade55ea3cde97770b1328fa31f44ff
treeb999e6f59e47c09debb8f4ef7b929f3d90fb66d4
parentfe95fb813efeece3a5df9b07d32dec3cfae5e51c
parent4b19afdb4e0b4bec6bbd77ce18d218d025ffe9c5
Merge branch 'master' of git://factorcode.org/git/factor

Conflicts:

extra/printf/printf-docs.factor
extra/printf/printf-docs.factor