]> 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: 8f8e406 fc7730a)
Merge remote-tracking branch 'origin/Mario/jetpack_endmatch_fix'
authorRudolf Polzer <divverent@xonotic.org>
Thu, 8 May 2014 16:45:11 +0000 (18:45 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 8 May 2014 16:45:11 +0000 (18:45 +0200)
* origin/Mario/jetpack_endmatch_fix:
  Don't keep spamming jetpack effect/sound after the match ends


Trivial merge