]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'TimePath/items' into 'master'
authorTimePath <andrew.hardaker1995@gmail.com>
Thu, 29 Oct 2015 08:19:33 +0000 (08:19 +0000)
committerTimePath <andrew.hardaker1995@gmail.com>
Thu, 29 Oct 2015 08:19:33 +0000 (08:19 +0000)
commitf93bcb5dd8686abd0b407df953ad211f3265eb91
tree36f73b289c13ef9f5e6d153405ce36f8818d3aea
parentd0273d1721d85e1df504f26c36239743b2d80409
parent349aeb508e5a3d577df60bef8a552da2db7d928d
Merge branch 'TimePath/items' into 'master'

Cleanup item pickups (M merge request)

See merge request !245