Merge branch 'Mario/strength_stat_field' into 'master'
authorterencehill <piuntn@gmail.com>
Wed, 6 May 2020 22:56:13 +0000 (22:56 +0000)
committerterencehill <piuntn@gmail.com>
Wed, 6 May 2020 22:56:13 +0000 (22:56 +0000)
commitdb39fc1518a9f7e66e8f8dc6bffac7fe9c65a442
tree61e52d9ed88e88bedfa73b16b6a28faf2f4359ed
parentb0cf4c6dd97724dabf844d02e0e3252e9bf86655
parent65ba38c5228d8af26ac2b04b6e6e536a1772f446
Merge branch 'Mario/strength_stat_field' into 'master'

Merge branch Mario/strength_stat_field (S merge request)

See merge request xonotic/xonotic-data.pk3dir!795
qcsrc/common/t_items.qc
qcsrc/server/bot/default/havocbot/havocbot.qc
qcsrc/server/client.qc