]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit - qcsrc/common/minigames/cl_minigames.qc
Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Tue, 27 Jun 2017 12:50:05 +0000 (22:50 +1000)
committerMario <mario@smbclan.net>
Tue, 27 Jun 2017 12:50:05 +0000 (22:50 +1000)
commitb047bc6c8770d3d5e585bdf246062fcba1d5d324
tree73d33a9aaec7f6d37a8259b01bdfaf49ad436e16
parentf4ff4338b069158318a4963750698fbabdb959f1
parenta47323a8f856966f52ab976a18d221a36faa1e83
Merge branch 'master' into Mario/monsters
qcsrc/common/triggers/func/breakable.qc