]> 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: e464e20 df73773)
Merge remote branch 'origin/mirceakitsune/gravity_trigger'
authorRudolf Polzer <divVerent@alientrap.org>
Sat, 8 May 2010 12:57:34 +0000 (14:57 +0200)
committerRudolf Polzer <divVerent@alientrap.org>
Sat, 8 May 2010 12:57:34 +0000 (14:57 +0200)

Trivial merge