Merge remote-tracking branch 'origin/terencehill/forced_intermission_eventchase'
authorSamual Lenks <samual@xonotic.org>
Wed, 12 Dec 2012 21:44:46 +0000 (16:44 -0500)
committerSamual Lenks <samual@xonotic.org>
Wed, 12 Dec 2012 21:44:46 +0000 (16:44 -0500)
commitf879dea04474678d9a263cf5d8c127415e390ca5
treef6f54af5c6765572c72f9acb6ecb6efd67e966a7
parent591e13cf6bf66a6b14039ce393a5d5dbb9f8bc3c
parent6c4aca14b76d71f2ebabb059cd1ee30f6cb7c790
Merge remote-tracking branch 'origin/terencehill/forced_intermission_eventchase'

Conflicts:
qcsrc/client/View.qc
qcsrc/client/View.qc