]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/master' into samual/keepaway
authorunknown <samual@xonotic.org>
Fri, 3 Dec 2010 14:02:29 +0000 (09:02 -0500)
committerunknown <samual@xonotic.org>
Fri, 3 Dec 2010 14:02:29 +0000 (09:02 -0500)
1  2 
defaultXonotic.cfg

Simple merge