From: Rudolf Polzer Date: Fri, 24 Sep 2010 10:50:35 +0000 (+0200) Subject: Merge branch 'master' into divVerent/crypto2 X-Git-Tag: xonotic-v0.1.0preview~125^2~25 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=6826e88c31c82664e3dc934e7d1888dea68f4d80;hp=--cc Merge branch 'master' into divVerent/crypto2 Conflicts: misc/builddeps/dp.win64/include/d3dtypes.h misc/builddeps/dp.win64/include/dsound.h --- 6826e88c31c82664e3dc934e7d1888dea68f4d80