]> gitweb.factorcode.org Git - factor.git/commit
Fix conflict
authorSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Mon, 9 Feb 2009 06:34:00 +0000 (00:34 -0600)
committerSlava Pestov <slava@slava-pestovs-macbook-pro.local>
Mon, 9 Feb 2009 06:34:00 +0000 (00:34 -0600)
commit3045777f02460756047d61a70e2fa7f306f52e06
tree35c35e4b3b82b2913079dc2452f68755bdb06a58
parentea60a0362f386fd69e32bb3bf9c46bc98ae41175
parentc4aa14b9d96d0a55b6c94e2441d952cf056ddfcc
Fix conflict
basis/cocoa/messages/messages.factor
basis/ui/ui.factor