]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Sun, 12 Mar 2017 17:46:19 +0000 (20:46 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 12 Mar 2017 17:46:19 +0000 (20:46 +0300)
commit28fdf4b4eb6fd0793990cd58bcaf33b19d42196a
tree52413edddc92264a0a4b4b8079598408a294e5f0
parentb64f7f56e53a0a80a8d9cb3f0605f8b355e48d3d
parente3cdd0d74d46d59d75de77615d19b3cfac4dad3e
Merge branch 'master' into Lyberta/master
bal-wep-overkill.cfg
qcsrc/client/view.qc
qcsrc/common/stats.qh
qcsrc/server/g_world.qc