]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/URS3
authorLyberta <lyberta@lyberta.net>
Sun, 10 Sep 2017 23:19:54 +0000 (02:19 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 10 Sep 2017 23:19:54 +0000 (02:19 +0300)
commit142a0bd18856be565c6d4aed0cda7e743168e7e5
tree56fb54e565ed3aa0ed0cc6064f063eb117ad628c
parent18fd999f31419fe7019587ebc1b83e43f635bb0e
parent1a992df8b237a07c159ffe0cb093d6440780bd8b
Merge branch 'master' into Lyberta/URS3
qcsrc/common/t_items.qc
qcsrc/server/miscfunctions.qc