]> gitweb.factorcode.org Git - factor.git/commit
Merge branch 'master' of git://repo.or.cz/factor/jcg
authorDoug Coleman <doug.coleman@gmail.com>
Wed, 10 Dec 2008 03:16:37 +0000 (21:16 -0600)
committerDoug Coleman <doug.coleman@gmail.com>
Wed, 10 Dec 2008 03:16:37 +0000 (21:16 -0600)
commit4f20c0813f7546d2cef278239158be9861fdcff3
tree405d2fcda7872ba19cca29fc43a87671d6a4ddaa
parente42de00371a771ddeb9b5e58283c81046a307870
parent347eb5647bc6c765911ff59d911a824ebf508535
Merge branch 'master' of git://repo.or.cz/factor/jcg

Conflicts:

basis/ui/cocoa/cocoa.factor
basis/ui/cocoa/cocoa.factor
basis/ui/gadgets/worlds/worlds.factor
basis/ui/ui.factor
basis/ui/windows/windows.factor
basis/ui/x11/x11.factor
extra/ui/offscreen/offscreen.factor