]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: b0cf4c6 65ba38c)
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)
Merge branch Mario/strength_stat_field (S merge request)

See merge request xonotic/xonotic-data.pk3dir!795

1  2 
qcsrc/common/t_items.qc patch | diff1 | diff2 | blob | history
qcsrc/server/bot/default/havocbot/havocbot.qc patch | diff1 | diff2 | blob | history
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/t_items.qc
Simple merge
diff --cc qcsrc/server/client.qc
Simple merge