]> gitweb.factorcode.org Git - factor.git/commit
Fix conflict
authorSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Wed, 19 Nov 2008 04:18:14 +0000 (22:18 -0600)
committerSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Wed, 19 Nov 2008 04:18:14 +0000 (22:18 -0600)
commit281657dd829ff5cef4938ce8be35b534dcdf66d6
tree7bb214b214f66a8c8f071a7062017979f1aa00aa
parent2fe364a7bbb198e70b816ccd7f49945c9dedf9fd
parentd62a6c4b094c144e250e5bacb79e589854eb9875
Fix conflict
basis/alien/c-types/c-types.factor
basis/alien/structs/structs.factor
basis/compiler/tests/alien.factor
basis/locals/locals.factor
basis/opengl/opengl.factor
basis/ui/gadgets/buttons/buttons.factor
basis/ui/render/render.factor