]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 717d949 7c95d65)
Merge branch 'amade/small-fixes' into 'master'
authorMario <zacjardine@y7mail.com>
Fri, 7 Apr 2017 04:05:38 +0000 (04:05 +0000)
committerMario <zacjardine@y7mail.com>
Fri, 7 Apr 2017 04:05:38 +0000 (04:05 +0000)
Amade/small fixes

See merge request !412

1  2 
qcsrc/common/t_items.qc patch | diff1 | diff2 | blob | history
qcsrc/common/util.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/t_items.qc
Simple merge
diff --cc qcsrc/common/util.qc
Simple merge