]> 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: 1cf26eb f2d431d)
Merge branch 'Mario/buff_timer' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 17 Aug 2019 14:49:54 +0000 (14:49 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 17 Aug 2019 14:49:54 +0000 (14:49 +0000)
Merge branch Mario/buff_timer (M merge request)

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

1  2 
qcsrc/common/t_items.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