]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into mirceakitsune/event_chasecam
authorSamual <samual@xonotic.org>
Thu, 21 Apr 2011 01:27:22 +0000 (21:27 -0400)
committerSamual <samual@xonotic.org>
Thu, 21 Apr 2011 01:27:22 +0000 (21:27 -0400)
commita89a627ea0a1c8209ea7406910566d259bc8ffb0
treefc6ee7e65b8ebd88a659b1f2c5d030917164ae04
parent5dd9cd68d9db68adef7efeee9adf09980dc9677c
parentfc189c1838060ff3e0c395743d385da8c07f5c0e
Merge remote branch 'origin/master' into mirceakitsune/event_chasecam

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