Fix conflicts

author Slava Pestov <slava@slava-pestovs-macbook-pro.local>

Thu, 26 Feb 2009 09:12:19 +0000 (03:12 -0600)

committer Slava Pestov <slava@slava-pestovs-macbook-pro.local>

Thu, 26 Feb 2009 09:12:19 +0000 (03:12 -0600)
author Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Thu, 26 Feb 2009 09:12:19 +0000 (03:12 -0600)
committer Slava Pestov <slava@slava-pestovs-macbook-pro.local>
Thu, 26 Feb 2009 09:12:19 +0000 (03:12 -0600)
diff --cc basis/ui/gadgets/frames/frames-docs.factor
Simple merge
diff --cc core/kernel/kernel-docs.factor
Simple merge
diff --cc extra/game-input/dinput/dinput.factor
Simple merge
author	Slava Pestov <slava@slava-pestovs-macbook-pro.local>
	Thu, 26 Feb 2009 09:12:19 +0000 (03:12 -0600)
committer	Slava Pestov <slava@slava-pestovs-macbook-pro.local>
	Thu, 26 Feb 2009 09:12:19 +0000 (03:12 -0600)
		1	2
basis/ui/gadgets/frames/frames-docs.factor	patch \|	diff1 \|	diff2 \|	blob \| history
core/kernel/kernel-docs.factor	patch \|	diff1 \|	diff2 \|	blob \| history
extra/game-input/dinput/dinput.factor	patch \|	diff1 \|	diff2 \|	blob \| history