Merge branch 'master' of ssh://git.xonotic.org/xonotic
authorRudolf Polzer <divverent@alientrap.org>
Fri, 25 Jun 2010 18:52:31 +0000 (20:52 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 25 Jun 2010 18:52:31 +0000 (20:52 +0200)
commita8107a6553508c297ccdd8f0f701cf2b541370ce
treee3910725243cf45e63a64bc69b47694f36ebec10
parentdf6c8dfa67c58ed99fd4847551c6a22d61137b78
parentcbe525917b0fe24315078d21195da047b84d0bd1
Merge branch 'master' of ssh://git.xonotic.org/xonotic
all