Merge branch 'master' of git://github.com/slavapestov/factor

author Erik Charlebois <erikcharlebois@gmail.com>

Sat, 10 Apr 2010 06:49:40 +0000 (23:49 -0700)

committer Erik Charlebois <erikcharlebois@gmail.com>

Sat, 10 Apr 2010 06:49:40 +0000 (23:49 -0700)
author Erik Charlebois <erikcharlebois@gmail.com>
Sat, 10 Apr 2010 06:49:40 +0000 (23:49 -0700)
committer Erik Charlebois <erikcharlebois@gmail.com>
Sat, 10 Apr 2010 06:49:40 +0000 (23:49 -0700)
diff --cc basis/windows/directx/d3d9types/d3d9types.factor
Simple merge
author	Erik Charlebois <erikcharlebois@gmail.com>
	Sat, 10 Apr 2010 06:49:40 +0000 (23:49 -0700)
committer	Erik Charlebois <erikcharlebois@gmail.com>
	Sat, 10 Apr 2010 06:49:40 +0000 (23:49 -0700)