]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/samual/defaults/fix_scoreboard_offset'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 14 May 2011 12:30:45 +0000 (14:30 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 14 May 2011 12:30:45 +0000 (14:30 +0200)
1  2 
defaultXonotic.cfg

Simple merge