]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'martin-t/blaster' into martin-t/master2
authorMartin Taibr <taibr.martin@gmail.com>
Mon, 26 Aug 2019 18:33:26 +0000 (20:33 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Mon, 26 Aug 2019 18:33:26 +0000 (20:33 +0200)
commit4ca310a5cf62ea9f577659f523194d7da36a3f9c
tree884c7087f7e4b6135dca73199020c9bd22337bd5
parent40de0d6f065f2338085e4197dcb20e5c647d4924
parenta12365406857ab5eb02b066e29b7c4587dc2da83
Merge branch 'martin-t/blaster' into martin-t/master2
bal-wep-xonotic.cfg