Merge branch 'master' into terencehill/weaponmodel_effects_2
authorterencehill <piuntn@gmail.com>
Sun, 31 Jan 2016 11:21:28 +0000 (12:21 +0100)
committerterencehill <piuntn@gmail.com>
Sun, 31 Jan 2016 11:21:28 +0000 (12:21 +0100)
commitcd3d62397dfaa03707d6b273538e8ce0157fbde9
treed61cfe6f8eca1b284ca9a15617435dd6e6670237
parent13b3069ae3ae1e8d7dce41eb10db5052a74dc80d
parent03abee3d5ff2cd543f2c2036990f05b5396e8e62
Merge branch 'master' into terencehill/weaponmodel_effects_2
defaultXonotic.cfg