]> 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: 25e676a 95fd8c7)
Merge branch 'Lyberta/TeamplayOverhaul' into Lyberta/Survival
authorLyberta <lyberta@lyberta.net>
Mon, 9 Apr 2018 01:17:16 +0000 (04:17 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 9 Apr 2018 01:17:16 +0000 (04:17 +0300)
1  2 
qcsrc/client/hud/panel/modicons.qc patch | diff1 | diff2 | blob | history
qcsrc/menu/xonotic/dialog_multiplayer_create.qc patch | diff1 | diff2 | blob | history
qcsrc/menu/xonotic/util.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/menu/xonotic/util.qc
Simple merge
diff --cc qcsrc/server/g_world.qc
Simple merge