]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'Lyberta/Survival' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Fri, 9 Mar 2018 11:51:09 +0000 (14:51 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 9 Mar 2018 11:51:09 +0000 (14:51 +0300)
commit1c1f0da0037d2b3f64768cab545631b2fdfd6035
tree76946e60df34de88e9ad48acaf5051e791c4204b
parent019116b8447294682087ba9a23b9268c75a55b3e
parentf8042f37cd4ff386e7ca0cf43d76130f60e9f95f
Merge branch 'Lyberta/Survival' into Lyberta/master
bal-wep-xonotic.cfg
qcsrc/client/view.qc
qcsrc/common/mutators/mutator/nades/nades.qc
qcsrc/common/stats.qh
qcsrc/common/wepent.qc
qcsrc/menu/xonotic/util.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh
qcsrc/server/g_world.qc
xonotic-server.cfg