]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'refs/remotes/origin/terencehill/newpanelhud'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 25 Sep 2010 08:28:54 +0000 (10:28 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 25 Sep 2010 08:28:54 +0000 (10:28 +0200)
1  2 
defaultXonotic.cfg

Simple merge