Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Mon, 26 Apr 2010 12:11:23 +0000 (14:11 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 26 Apr 2010 12:11:23 +0000 (14:11 +0200)
commit169208535f74c8cd2c2ca4d855cce6fd304af7b1
tree2d626971ba6f9662364813d0f2e87e47a32cc711
parent474bca19f8ed45309e7c021316ac5cf53bf65f63
parent740a38b25a4637627123304d6355a355376a1979
Merge branch 'master' of ssh://xonotic@git.xonotic.org/xonotic
all