]> 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 | compact (merge: fd5886b 0aae379)
Merge remote branch 'origin/fruitiex/effectinfo_nerf'
authorRudolf Polzer <divVerent@xonotic.org>
Fri, 26 Nov 2010 08:08:23 +0000 (09:08 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Fri, 26 Nov 2010 08:08:23 +0000 (09:08 +0100)

Trivial merge