Merge branch 'TimePath/xonotic-data.pk3dir-TimePath/compat_weapons'
authorMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 02:41:58 +0000 (13:41 +1100)
committerMario <zacjardine@y7mail.com>
Thu, 27 Nov 2014 02:41:58 +0000 (13:41 +1100)
commit841eddf27ba5cb43d5b3fc01e67cb9d7526e6bdc
tree86a7bfe5d04f616fbc367ea8a531dd7caabc0977
parentcab456712c62ec5d5057e6bff4a3bb6cccf953cf
parent132af39c3a1b59961f8720c38c5e53ecad372d9a
Merge branch 'TimePath/xonotic-data.pk3dir-TimePath/compat_weapons'