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