]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Wed, 10 May 2017 12:41:15 +0000 (15:41 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 10 May 2017 12:41:15 +0000 (15:41 +0300)
commit85ee73251ebbc36cbdc943baaf1f3f605fe88547
tree313879dbc5e1270daaa760921969ebfb218d8e6c
parentc98a0334a03108340377c58d82be64010e362b72
parent44182002afcc9fdeca93c8296185258d374f6513
Merge branch 'master' into Lyberta/master
qcsrc/client/view.qc
qcsrc/server/client.qc
qcsrc/server/g_world.qc