]> gitweb.factorcode.org Git - factor.git/commit
Fix conflict
authorSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Tue, 27 Jan 2009 21:49:49 +0000 (15:49 -0600)
committerSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Tue, 27 Jan 2009 21:49:49 +0000 (15:49 -0600)
commit5cd4f65e59c09a3830b4eb050cdda375393f7d12
tree1be64fd26d13497e829956845a071505b62d16eb
parent8b6ae748b9fe8c3e97daf58509da10957455751f
parentb655f71d5b129a0362dd6c65d392af722fd8d646
Fix conflict
basis/help/tutorial/tutorial.factor
basis/ui/tools/tools-docs.factor
basis/ui/ui-docs.factor