]> 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: 5fcaa5e 4e58c45)
Merge remote-tracking branch 'origin/Mario/despawn_effects'
authorMario <zacjardine@y7mail.com>
Fri, 14 Nov 2014 09:16:46 +0000 (20:16 +1100)
committerMario <zacjardine@y7mail.com>
Fri, 14 Nov 2014 09:16:46 +0000 (20:16 +1100)

Trivial merge