]> 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: 6652322 942e1c3)
Merge branch 'martin-t/okc2' into 'master'
authorMario <zacjardine@y7mail.com>
Sat, 25 Nov 2017 01:19:47 +0000 (01:19 +0000)
committerMario <zacjardine@y7mail.com>
Sat, 25 Nov 2017 01:19:47 +0000 (01:19 +0000)
Overkill Casual - step 2 - dodging

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

1  2 
qcsrc/common/stats.qh patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/stats.qh
Simple merge