From: Rudolf Polzer Date: Tue, 7 Sep 2010 17:50:14 +0000 (+0200) Subject: Merge branch 'divVerent/crypto2' of ssh://git.xonotic.org/xonotic into divVerent... X-Git-Tag: xonotic-v0.1.0preview~125^2~42 X-Git-Url: http://git.xonotic.org/?p=xonotic%2Fxonotic.git;a=commitdiff_plain;h=f3922b7a08f53c82092930237c249064ed47ecaf Merge branch 'divVerent/crypto2' of ssh://git.xonotic.org/xonotic into divVerent/crypto2 --- f3922b7a08f53c82092930237c249064ed47ecaf