Merge remote-tracking branch 'origin/master' into samual/combined_updates
authorSamual Lenks <samual@xonotic.org>
Sun, 26 Jan 2014 19:35:28 +0000 (14:35 -0500)
committerSamual Lenks <samual@xonotic.org>
Sun, 26 Jan 2014 19:35:28 +0000 (14:35 -0500)
1  2 
qcsrc/common/mapinfo.qc

Simple merge