]> git.xonotic.org Git - xonotic/xonotic.git/commit
Merge branch 'master' into martin-t/vbots
authorMartin Taibr <taibr.martin@gmail.com>
Sun, 18 Aug 2019 16:47:11 +0000 (18:47 +0200)
committerMartin Taibr <taibr.martin@gmail.com>
Sun, 18 Aug 2019 16:47:11 +0000 (18:47 +0200)
commit5fd7b96ec24aa03745668fc9bbfe4a411e7d5ebd
tree1498edef4d36d9dc1a8411784c0fd581bd72c336
parent24954793663f3a544205352c38e10a9ecd8ae7bf
parent09e7fefb4af9ecc1711c03ffdf4ef83dc761dc62
Merge branch 'master' into martin-t/vbots