]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 0d0b137 9fb9a73)
Merge branch 'mirceakitsune/hud_postprocessing' of git://git.xonotic.org/xonotic...
authorMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 1 May 2011 12:54:01 +0000 (15:54 +0300)
committerMircea Kitsune <sonichedgehog_hyperblast00@yahoo.com>
Sun, 1 May 2011 12:54:01 +0000 (15:54 +0300)

Trivial merge