]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into Mario/combined_updates
authorMario <zacjardine@y7mail.com>
Mon, 9 Feb 2015 06:55:41 +0000 (17:55 +1100)
committerMario <zacjardine@y7mail.com>
Mon, 9 Feb 2015 06:55:41 +0000 (17:55 +1100)
1  2 
qcsrc/common/mapinfo.qc
qcsrc/common/mapinfo.qh

Simple merge
Simple merge