]> 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: f12a9db 2e004af)
Merge remote-tracking branch 'origin/terencehill/freezetag_health_effect'
authorRudolf Polzer <divverent@xonotic.org>
Mon, 25 Jul 2011 16:51:54 +0000 (18:51 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Mon, 25 Jul 2011 16:51:54 +0000 (18:51 +0200)

Trivial merge