]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into terencehill/ons_camera 377/head
authorterencehill <piuntn@gmail.com>
Thu, 20 Oct 2016 13:54:18 +0000 (15:54 +0200)
committerterencehill <piuntn@gmail.com>
Thu, 20 Oct 2016 13:54:18 +0000 (15:54 +0200)
commitf60c05d53612aba786e7f24fc7a8920cd1b7495c
treef0d59236cf38cef52339f98b16e05a19c24725c8
parentd343e893d804438f50c8013e498aa11704be05c4
parent77ba5a1b3592bd37ea7cfd030d299b4e5c2ccbc7
Merge branch 'master' into terencehill/ons_camera
qcsrc/common/gamemodes/gamemode/onslaught/sv_onslaught.qc