]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into TimePath/guide
authorTimePath <andrew.hardaker1995@gmail.com>
Mon, 31 Aug 2015 06:13:50 +0000 (16:13 +1000)
committerTimePath <andrew.hardaker1995@gmail.com>
Mon, 31 Aug 2015 06:13:50 +0000 (16:13 +1000)
commit11e413309f09ba0713dc374d714d6c0d46dd2d3a
tree1efbd39d35b98a031dceb548ec12a7ccc8e7ab82
parent69333b7e90b67c994b076e6ca855eb300bb8a0a8
parent2b0443836b8b4b11521908c4d4688db764cb3822
Merge branch 'master' into TimePath/guide
qcsrc/common/mapinfo.qc
qcsrc/menu/classes.inc