]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/Mario/runematch_nuke', fixes #1419
authorRudolf Polzer <divverent@xonotic.org>
Thu, 21 Mar 2013 16:21:11 +0000 (17:21 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 21 Mar 2013 16:21:24 +0000 (17:21 +0100)
1  2 
qcsrc/server/cl_player.qc

Simple merge