]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' of git://nl.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Wed, 4 Jan 2012 12:44:30 +0000 (13:44 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Wed, 4 Jan 2012 12:44:30 +0000 (13:44 +0100)
1  2 
qcsrc/server/g_damage.qc

Simple merge