Merge branch 'master' into Lyberta/RandomItems
authorLyberta <lyberta@lyberta.net>
Sat, 25 Nov 2017 00:34:52 +0000 (03:34 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 25 Nov 2017 00:34:52 +0000 (03:34 +0300)
commit2d5f6090a4faee9716a9c149b9ac6927cc3bb9db
treecc1745949a6c78efc4ec0817a7cc4749f5a49ca1
parent87915c38a892fa1464b8c077014705ac0ead8e18
parentf09ee5127b69e0c26ca7a6481629d7f34dcc2f12
Merge branch 'master' into Lyberta/RandomItems
qcsrc/common/stats.qh
qcsrc/server/defs.qh