Merge branch 'master' into divVerent/crypto2
authorRudolf Polzer <divVerent@alientrap.org>
Fri, 24 Sep 2010 10:50:35 +0000 (12:50 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Fri, 24 Sep 2010 10:50:35 +0000 (12:50 +0200)
commit6826e88c31c82664e3dc934e7d1888dea68f4d80
treeda66f3e364185d9c70566d9b91ae0c8a6ce86e11
parent849728118c26bd23a26ec5a4c6c7015be43f0688
parenta3e251b725029e389da394bc9e94fd37a78c54e3
Merge branch 'master' into divVerent/crypto2

Conflicts:
misc/builddeps/dp.win64/include/d3dtypes.h
misc/builddeps/dp.win64/include/dsound.h
all