]> 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: 18fd999 1a992df)
Merge branch 'master' into Lyberta/URS3
authorLyberta <lyberta@lyberta.net>
Sun, 10 Sep 2017 23:19:54 +0000 (02:19 +0300)
committerLyberta <lyberta@lyberta.net>
Sun, 10 Sep 2017 23:19:54 +0000 (02:19 +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