]> 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: 75a74ff 8355e16)
Merge branch 'Lyberta/TeamplayFixes_' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Fri, 4 Aug 2017 21:51:41 +0000 (00:51 +0300)
committerLyberta <lyberta@lyberta.net>
Fri, 4 Aug 2017 21:51:41 +0000 (00:51 +0300)
1  2 
qcsrc/client/hud/panel/modicons.qc patch | diff1 | diff2 | blob | history
qcsrc/common/stats.qh patch | diff1 | diff2 | blob | history
qcsrc/common/t_items.qc patch | diff1 | diff2 | blob | history
qcsrc/server/g_world.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/client/hud/panel/modicons.qc
Simple merge
diff --cc qcsrc/common/stats.qh
Simple merge
diff --cc qcsrc/common/t_items.qc
Simple merge
diff --cc qcsrc/server/g_world.qc
Simple merge