]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into mirceakitsune/hud_postprocessing
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 22 Apr 2011 15:41:02 +0000 (18:41 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Fri, 22 Apr 2011 15:41:02 +0000 (18:41 +0300)
commit324d1afe64b738ee2e6960f6da5174ce11d87753
tree43b67e2572193922b9d844a44052518ab6a879e5
parent12a8e2b2fc09cbb1f43aa2185cd367c6415db240
parent8e55f49af4ce4e6240f2dd44b5066d2d294fe19a
Merge branch 'master' into mirceakitsune/hud_postprocessing
defaultXonotic.cfg
qcsrc/client/View.qc