]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge remote branch 'origin/master' into samual/fix_camera_in_intermission
authorSamual <samual@xonotic.org>
Mon, 29 Aug 2011 05:52:13 +0000 (01:52 -0400)
committerSamual <samual@xonotic.org>
Mon, 29 Aug 2011 05:52:13 +0000 (01:52 -0400)
commitb2baadb34fab4fa42d1529f083eb72b4df105049
tree29f4dc7a4eedd1e94d4055a7521b434ba09cc8a3
parenta52ea1981bc957b46874633877cbc9d20d3e88e4
parent297e90c2fbe1a3abdd3c888582d4458e7bc36518
Merge remote branch 'origin/master' into samual/fix_camera_in_intermission
qcsrc/client/View.qc