]> 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: a22cbff b2e3660)
Merge branch 'master' into Lyberta/GunGame
authorLyberta <lyberta@lyberta.net>
Mon, 11 Jun 2018 10:10:19 +0000 (13:10 +0300)
committerLyberta <lyberta@lyberta.net>
Mon, 11 Jun 2018 10:10:19 +0000 (13:10 +0300)
1  2 
qcsrc/common/mapinfo.qh patch | diff1 | diff2 | blob | history
qcsrc/server/g_world.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/common/mapinfo.qh
Simple merge
diff --cc qcsrc/server/g_world.qc
Simple merge