]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commit7dc8ba745f5d16096fb070e739d4ab6989e3c8d1
tree21b42b0c665812a8d6395084c096a7b30211d4db
parentc11d2fa7a42008982a71f98f3ddbb7cef0c98dc2
parent50c1071c99da4545ef285968205752f1c94ed258
Merge branch 'master' into Mario/combined_updates
qcsrc/common/mapinfo.qc
qcsrc/common/mapinfo.qh