Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Fri, 6 Aug 2010 06:37:15 +0000 (08:37 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 6 Aug 2010 06:37:15 +0000 (08:37 +0200)
commit40df4863a43c30b2fdabc36d408d4283c12c8d7c
treeb53b03efba9b2d22bd466bdc5837983602eb9e90
parent8e78fb405cd6e13a3c9187b3c3748769e66815ad
parent977e573f2ff7619d137657bab4fb08ac743202c1
Merge branch 'master' of ssh://git.xonotic.org/xonotic