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)
1  2 
defaultXonotic.cfg

Simple merge