]> gitweb.factorcode.org Git - factor.git/commit
Fix conflict
authorSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Sun, 25 Jan 2009 05:56:33 +0000 (23:56 -0600)
committerSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Sun, 25 Jan 2009 05:56:33 +0000 (23:56 -0600)
commitef223f26d54359e06929846a292e73a201b66975
tree8399ca2d02cbf29f1b5be1610847b2b367c4eca0
parentf66cbe688c7d5cac58730b7658931d1c6c8f1786
parentc074740746daa21c2b21d6148ac25c5fd98c436e
Fix conflict
basis/help/markup/markup.factor
basis/prettyprint/prettyprint.factor
basis/ui/gadgets/editors/editors.factor
core/parser/parser.factor