]> 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: cc77b45 9bf3260)
Merge branch 'Lyberta/PlayerTemplates' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Thu, 1 Jun 2017 13:10:23 +0000 (16:10 +0300)
committerLyberta <lyberta@lyberta.net>
Thu, 1 Jun 2017 13:10:23 +0000 (16:10 +0300)
1  2 
qcsrc/common/t_items.qc patch | diff1 | diff2 | blob | history
qcsrc/server/client.qc patch | diff1 | diff2 | blob | history
qcsrc/server/player.qc patch | diff1 | diff2 | blob | history

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