]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Lyberta/GunGame
authorLyberta <lyberta@lyberta.net>
Fri, 27 Apr 2018 09:19:05 +0000 (12:19 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 27 Apr 2018 09:19:05 +0000 (12:19 +0300)
1  2 
qcsrc/client/hud/panel/modicons.qc
qcsrc/menu/xonotic/util.qc
qcsrc/server/g_world.qc

Simple merge
Simple merge
Simple merge