]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/GunGame
authorLyberta <lyberta@lyberta.net>
Sat, 2 Dec 2017 15:54:27 +0000 (18:54 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 2 Dec 2017 15:54:27 +0000 (18:54 +0300)
commit7e7fedc8c00e9b0f2cba7ec0049aaa82d6fc97db
tree95473ca655d3fa9d4d502c59d119aa4a6c5d1a80
parent49be39dd819bfb86400aa545b69852cde4e3f180
parent65493c17d47c0d5ece5e28a999a0162c5b070acb
Merge branch 'master' into Lyberta/GunGame
qcsrc/common/stats.qh
qcsrc/server/g_world.qc