Merge branch 'divVerent/crypto2' of ssh://git.xonotic.org/xonotic into divVerent...
authorRudolf Polzer <divVerent@alientrap.org>
Tue, 7 Sep 2010 17:50:14 +0000 (19:50 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Tue, 7 Sep 2010 17:50:14 +0000 (19:50 +0200)
commitf3922b7a08f53c82092930237c249064ed47ecaf
tree5eb8bce9ad121c574196c4d796b092903b5e1844
parent2038538b005396681eb97c3aaa26681695696d8b
parent13a74ed2c1aab7221c7512e3040966bc47b6ca42
Merge branch 'divVerent/crypto2' of ssh://git.xonotic.org/xonotic into divVerent/crypto2