]> gitweb.factorcode.org Git - factor.git/commit
Fix conflict
authorSlava Pestov <slava@shill.local>
Thu, 24 Sep 2009 01:52:04 +0000 (20:52 -0500)
committerSlava Pestov <slava@shill.local>
Thu, 24 Sep 2009 01:52:04 +0000 (20:52 -0500)
commit0836e79e6654fc48a81d089d783cc2a623535316
tree4283a64b13a4d4165569d5934964d7086d3fc220
parent2406bdd6f76a85f19550e042be870b869c6b43ee
parentbea4aa76624e94a66360ae9b79afc8b938e6a65f
Fix conflict
basis/math/functions/functions-docs.factor
basis/regexp/regexp-docs.factor
core/combinators/combinators-docs.factor
core/math/parser/parser-docs.factor