Merge branch 'master' into martin-t/dmgtext
authorMartin Taibr <taibr.martin@gmail.com>
Fri, 2 Mar 2018 21:22:07 +0000 (22:22 +0100)
committerMartin Taibr <taibr.martin@gmail.com>
Fri, 2 Mar 2018 21:22:07 +0000 (22:22 +0100)
commit95a5a2479a35e264473e8ba3fc4e584553da42b3
tree129fa540f4e29bf471a411dff5b68be5dff6f7aa
parentd903130d75bb4daed8d9aa2b4a5631c0ec382ac3
parent10cef691dd4bc92687ff85479c01a70c7704569f
Merge branch 'master' into martin-t/dmgtext
xonotic-client.cfg