Merge remote-tracking branch 'origin/terencehill/mapvote_cursor_fix'
authorSamual Lenks <samual@xonotic.org>
Mon, 19 Aug 2013 21:13:07 +0000 (17:13 -0400)
committerSamual Lenks <samual@xonotic.org>
Mon, 19 Aug 2013 21:13:07 +0000 (17:13 -0400)
commitbfd9a6bc281daf500aeba8f10c6b00a855fb42ae
tree536fad94d6b6a703585170be96efa397bd7f7ff3
parent909912a9c1caf0c987ebbc4dc16deb27dc3eb6a7
parentbc204c9619a7f92d75fcb12faa4040fde921673d
Merge remote-tracking branch 'origin/terencehill/mapvote_cursor_fix'