Merge branch 'master' of git://de.git.xonotic.org/xonotic/xonotic-data.pk3dir
authorRudolf Polzer <divverent@xonotic.org>
Mon, 1 Apr 2013 11:38:20 +0000 (13:38 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 1 Apr 2013 11:38:20 +0000 (13:38 +0200)
1  2 
qcsrc/server/scores.qc

Simple merge