]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/FilterItemDefinition
authorLyberta <lyberta@lyberta.net>
Mon, 19 Mar 2018 15:57:43 +0000 (18:57 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 19 Mar 2018 15:57:43 +0000 (18:57 +0300)
commit39f46e8c5410727a05375a9e703fe6a6fb870241
treecf3d4a8912b7532b0d844d58c850ca386fff6829
parentb14b318d362e218d7339e771ad2878b2d87f0580
parent67440b9e66fc88ee9d30a3781a86f21acbd23293
Merge branch 'master' into Lyberta/FilterItemDefinition
qcsrc/server/defs.qh