]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 35cf636 ea71b9a)
Merge branch 'nyov/combined_updates/effects'
authorMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 01:35:05 +0000 (12:35 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 01:35:05 +0000 (12:35 +1100)

Trivial merge