]> 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: a5a607d b033eeb)
Merge branch 'master' into Lyberta/RandomItems
authorLyberta <lyberta@lyberta.net>
Mon, 16 Oct 2017 14:04:26 +0000 (17:04 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 16 Oct 2017 14:04:26 +0000 (17:04 +0300)
1  2 
qcsrc/common/t_items.qc patch | diff1 | diff2 | blob | history

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