]> 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: a371a92 45a4c40)
Merge remote-tracking branch 'origin/samual/fix_hud_postprocess_effects'
authorRudolf Polzer <divverent@xonotic.org>
Mon, 29 Aug 2011 04:51:09 +0000 (06:51 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 29 Aug 2011 04:51:09 +0000 (06:51 +0200)

Trivial merge