]> 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: 95888e3 d808ef4)
Merge branch 'Lyberta/OKShotgunRefire' into 'master'
authorMartin Taibr <taibr.martin@gmail.com>
Thu, 20 Sep 2018 20:28:28 +0000 (20:28 +0000)
committerMartin Taibr <taibr.martin@gmail.com>
Thu, 20 Sep 2018 20:28:28 +0000 (20:28 +0000)
Supposedly fix OKShotgun refire.

Closes #2099

See merge request xonotic/xonotic-data.pk3dir!595


Trivial merge