]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/mirceakitsune/respawn_ghosts'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 4 May 2010 11:17:55 +0000 (13:17 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 4 May 2010 11:17:55 +0000 (13:17 +0200)
1  2 
defaultXonotic.cfg

Simple merge