]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/terencehill/serverlist_fix'
authorRudolf Polzer <divverent@alientrap.org>
Thu, 13 Jan 2011 06:10:47 +0000 (07:10 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 13 Jan 2011 06:10:47 +0000 (07:10 +0100)
1  2 
qcsrc/menu/xonotic/serverlist.c

Simple merge