]> 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: 3cd932a 585860c)
Merge branch 'Lyberta/URS3' into Lyberta/RandomStartWeapons
authorLyberta <lyberta@lyberta.net>
Sat, 2 Sep 2017 14:50:01 +0000 (17:50 +0300)
committerLyberta <lyberta@lyberta.net>
Sat, 2 Sep 2017 14:50:01 +0000 (17:50 +0300)
1  2 
qcsrc/common/t_items.qc patch | diff1 | diff2 | blob | history
qcsrc/server/miscfunctions.qc patch | diff1 | diff2 | blob | history

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