]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit3f6354bf7f3019a80e13ca7536b9300226dd86fb
tree559715e3ac514dce10a03aaf862cc5258958cc85
parenta3ef9212641f70e112e5521ad5d4eb9f5fd84a67
parent7e9d4404fbd602050e843cb2169f8afab4163b11
Merge remote-tracking branch 'origin/master' into samual/combined_updates
qcsrc/common/mapinfo.qc