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)
Conflicts:
misc/builddeps/dp.win64/include/d3dtypes.h
misc/builddeps/dp.win64/include/dsound.h

1  2 
all

diff --cc all
Simple merge