]> gitweb.factorcode.org Git - factor.git/commit
Merge git://repo.or.cz/factor/jcg
authorJoe Groff <arcata@gmail.com>
Mon, 21 Jul 2008 03:19:59 +0000 (20:19 -0700)
committerJoe Groff <arcata@gmail.com>
Mon, 21 Jul 2008 03:19:59 +0000 (20:19 -0700)
commit690b744959975ce6cb48ebff1179ac56982d5292
treef209124120a40bdc7796ad8cd9d3474779149478
parentcc80b983c2d79e03f323e7612b683277968e07b4
parent816294f4fcb592050d39ae6b6d436d56fb3723e0
Merge git://repo.or.cz/factor/jcg

Conflicts:

extra/windows/dinput/dinput.factor
extra/windows/dinput/constants/constants.factor
extra/windows/dinput/dinput.factor