]> 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 | combined (merge: 45a8f6a 901df52)
Merge remote-tracking branch 'origin/Mario/minstagib_powerups_fix'
authorSamual Lenks <samual@xonotic.org>
Tue, 4 Jun 2013 19:20:14 +0000 (15:20 -0400)
committerSamual Lenks <samual@xonotic.org>
Tue, 4 Jun 2013 19:20:14 +0000 (15:20 -0400)

Trivial merge