]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'sev/new_crosshairs'
authorMario <zacjardine@y7mail.com>
Tue, 3 Feb 2015 10:51:50 +0000 (21:51 +1100)
committerMario <zacjardine@y7mail.com>
Tue, 3 Feb 2015 10:51:50 +0000 (21:51 +1100)
commit647dc46763c20178c5d9623f152671cfa1655277
treeacd167eed54da26733e277833adcec1ab2ee8a1d
parentea48961feb50159e05ef56f38b7fd0ebc15cc64e
parent8ef775b555751b01609216a28c636df530befea4
Merge branch 'sev/new_crosshairs'