]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'samual/serverlist' of http://nl.git.xonotic.org/xonotic/xonotic-data...
authorSamual Lenks <samual@xonotic.org>
Thu, 10 Oct 2013 17:25:17 +0000 (13:25 -0400)
committerSamual Lenks <samual@xonotic.org>
Thu, 10 Oct 2013 17:25:17 +0000 (13:25 -0400)
1  2 
qcsrc/menu/xonotic/serverlist.c

Simple merge