Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Mon, 26 Apr 2010 09:10:20 +0000 (11:10 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 26 Apr 2010 09:10:20 +0000 (11:10 +0200)
commit740a38b25a4637627123304d6355a355376a1979
treea1a3632e79708f4b0aaab816a6586dca6ed0bd69
parentef35235811287ea777c208252d49f626ede8c44f
parent27fd916063a5cd6f7de90d4b976fc4108ae51a6c
Merge branch 'master' of ssh://git.xonotic.org/xonotic
all