gitweb.factorcode.org Git - factor.git/commit

]> gitweb.factorcode.org Git - factor.git/commit

projects / factor.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: b86681e f72f9a8)

author	Slava Pestov <slava@slava-pestovs-macbook-pro.local>
	Sat, 29 Nov 2008 11:14:49 +0000 (05:14 -0600)
committer	Slava Pestov <slava@slava-pestovs-macbook-pro.local>
	Sat, 29 Nov 2008 11:14:49 +0000 (05:14 -0600)
commit	e8a69a3aeab5c96f071e4d41297d56397d0f7191
tree	0dd259726280b5357f08fd319db776196ac5950b	tree \| snapshot
parent	b86681e2d5468f1154186266bb02fc1ac3e59c9c	commit \| diff
parent	f72f9a8f45dc1e6b722d2c775ec599512488d73b	commit \| diff

Fix conflict

14 files changed:

basis/alien/c-types/c-types-tests.factor	diff1 \|	diff2 \|	blob \| history
basis/alien/c-types/c-types.factor	diff1 \|	diff2 \|	blob \| history
basis/alien/structs/structs.factor	diff1 \|	diff2 \|	blob \| history
basis/compiler/tests/alien.factor	diff1 \|	diff2 \|	blob \| history
basis/compiler/tests/codegen.factor	diff1 \|	diff2 \|	blob \| history
basis/compiler/tree/propagation/propagation-tests.factor	diff1 \|	diff2 \|	blob \| history
basis/locals/locals.factor	diff1 \|	diff2 \|	blob \| history
basis/opengl/opengl.factor	diff1 \|	diff2 \|	blob \| history
basis/ui/gadgets/buttons/buttons.factor	diff1 \|	diff2 \|	blob \| history
basis/ui/render/render.factor	diff1 \|	diff2 \|	blob \| history
core/syntax/syntax.factor	diff1 \|	diff2 \|	blob \| history
core/words/words.factor	diff1 \|	diff2 \|	blob \| history
extra/cfdg/cfdg.factor	diff1 \|	diff2 \|	blob \| history
extra/hello-world/deploy.factor	diff1 \|	diff2 \|	blob \| history

Factor programming language