]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Tue, 28 Mar 2017 08:53:39 +0000 (11:53 +0300)
committerLyberta <lyberta@lyberta.net>
Tue, 28 Mar 2017 08:53:39 +0000 (11:53 +0300)
commit0a58cfa8fb8955f20b847dc2a75424506a1f2d9b
treed9b2d125a84701f3a81862a4a04f2354e1d74211
parent8b0d514d0ecd8ad48810bd9cc935d73071fc510a
parentf15553e9346a2d78e10e9a759d9af1c9a93a44ca
Merge branch 'master' into Lyberta/master
defaultXonotic.cfg
qcsrc/server/client.qc