]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Sun, 2 Apr 2017 08:25:18 +0000 (11:25 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 2 Apr 2017 08:25:18 +0000 (11:25 +0300)
commit5ef5a7676fb4c676e2097e6a19e7bc1c578bdf61
tree10c15789ff50944e532b0078c6e78d4095cba730
parent97b5aeedad3a6dac08567b4cd094fb167229f067
parentaf7ecbff777859dbf824f2de864d736936b0a12c
Merge branch 'master' into Lyberta/Survival
qcsrc/common/mapinfo.qh
qcsrc/server/client.qc
qcsrc/server/mutators/events.qh