Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Tue, 14 Sep 2010 04:00:59 +0000 (06:00 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 14 Sep 2010 04:00:59 +0000 (06:00 +0200)
commit0a49b6cf7fc5732685cfbc8c055056896ac38396
treea025fdaab90ac2026b40072a7abbab146926cb3c
parentce362bfaadb58b0f414b298b72575e1130ad769d
parent4bfcaf17a9a6370f0c939810d83c4ea99189cde4
Merge branch 'master' of ssh://git.xonotic.org/xonotic
all