]> gitweb.factorcode.org Git - factor.git/commit
Fix conflicts
authorSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Thu, 26 Feb 2009 09:12:19 +0000 (03:12 -0600)
committerSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Thu, 26 Feb 2009 09:12:19 +0000 (03:12 -0600)
commitc8d5e988980728d775e3eea622c1cb82c7b678c5
tree5a75b9f64fcf61c4a43bb70c9f0a9b8d952be901
parent73e1b4c5e2ef032a7fbf42582554e80e2a9441f5
parenta5561146b88ae82062275b2e09e4a6c2f56ee2f1
Fix conflicts
basis/ui/gadgets/frames/frames-docs.factor
core/kernel/kernel-docs.factor
extra/game-input/dinput/dinput.factor