]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/bulldozer
authorMario <mario@smbclan.net>
Sun, 15 Nov 2015 10:32:10 +0000 (20:32 +1000)
committerMario <mario@smbclan.net>
Sun, 15 Nov 2015 10:32:10 +0000 (20:32 +1000)
commit1e31381058a302273d1a3f907f1dd72885845b27
tree7c7f140031d10b157fda9ea30f56c91960ea3424
parent93197a482165b9729aa842d4125eb2b3283b4b8c
parenta7961101654c64e843bb573aac20867a1d10a2a2
Merge branch 'master' into Mario/bulldozer
qcsrc/common/minigames/cl_minigames.qh
qcsrc/common/minigames/sv_minigames.qh