]> 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: 6cf0f28 264c9f4)
Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/master
authorLyberta <lyberta@lyberta.net>
Wed, 5 Jul 2017 23:15:06 +0000 (02:15 +0300)
committerLyberta <lyberta@lyberta.net>
Wed, 5 Jul 2017 23:15:06 +0000 (02:15 +0300)
1  2 
qcsrc/client/hud/panel/modicons.qc patch | diff1 | diff2 | blob | history
qcsrc/common/t_items.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/hud/panel/modicons.qc
Simple merge
diff --cc qcsrc/common/t_items.qc
Simple merge