]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commita8adc0d6f831cbad3f3255bcb8c74cdf35a70d76
tree77f62913f103914682a2dfa31e932c38c878a4c6
parent5fcaa5e1251bcbbdedf31d885bdca0b2b75811c7
parent4e58c45ae60668d74b15c7d35e883735aa6688e7
Merge remote-tracking branch 'origin/Mario/despawn_effects'