]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Lyberta/GiveResourceWithLimit
authorLyberta <lyberta@lyberta.net>
Sat, 31 Mar 2018 05:29:03 +0000 (08:29 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 31 Mar 2018 05:29:03 +0000 (08:29 +0300)
1  2 
qcsrc/server/mutators/events.qh

Simple merge