Merge branch 'asciiwolf/xonotic-appdata'
authorMario <mario@smbclan.net>
Fri, 19 Oct 2018 21:12:24 +0000 (07:12 +1000)
committerMario <mario@smbclan.net>
Fri, 19 Oct 2018 21:12:24 +0000 (07:12 +1000)
commitdb66da3c52598d1ba2555a64a7bb95b6daedff65
tree060e2d3ccc5e725d7c237ad85a7749fc4dab7d9c
parent0360202b4d19c963ae5f57f42ed370a6de67799a
parent37e3d71e28441abac3bc00682559b0076fe8dde2
Merge branch 'asciiwolf/xonotic-appdata'