]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/ons_camera
authorterencehill <piuntn@gmail.com>
Tue, 18 Oct 2016 17:52:27 +0000 (19:52 +0200)
committerterencehill <piuntn@gmail.com>
Tue, 18 Oct 2016 17:52:27 +0000 (19:52 +0200)
commitdfd83905b964f87db1a9b206767a5b207991038a
tree667243f8de6048c9fa5c9471dd67339f0ebf5a95
parent64e4b229339877b89f155e2bfd4d1924903d9edc
parent4ac152b3bf0f8aff323c0d9ebce6397524d8b1ad
Merge branch 'master' into terencehill/ons_camera
qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc