]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/GunGame
authorLyberta <lyberta@lyberta.net>
Wed, 4 Apr 2018 16:41:35 +0000 (19:41 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 4 Apr 2018 16:41:35 +0000 (19:41 +0300)
commit3d8cfa024224031606f03102a4e521a23cd26d94
tree4e6ecff3feca5cb91af9edf218c3f4c103d51bad
parent7654ca8a65b9e184e571f45092750fdb1ab7dabb
parent71636e8f68cd31db1aabb442259a11c3bb3b3866
Merge branch 'master' into Lyberta/GunGame
qcsrc/common/stats.qh
qcsrc/menu/xonotic/util.qc