]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/mirceakitsune/hud_postprocessing'
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 24 Jun 2011 21:45:45 +0000 (23:45 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 24 Jun 2011 21:45:45 +0000 (23:45 +0200)
1  2 
defaultXonotic.cfg

Simple merge