]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/fruitiex/xpm'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 28 Dec 2010 13:07:31 +0000 (14:07 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 28 Dec 2010 13:07:31 +0000 (14:07 +0100)
1  2 
qcsrc/server/g_world.qc

Simple merge