]> de.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: 8e3abc5 03185eb)
Merge branch 'master' into Mario/user_movetypes
authorMario <mario@smbclan.net>
Thu, 18 Aug 2016 15:06:52 +0000 (01:06 +1000)
committerMario <mario@smbclan.net>
Thu, 18 Aug 2016 15:06:52 +0000 (01:06 +1000)
1  2 
qcsrc/server/g_world.qc patch | diff1 | diff2 | blob | history

diff --cc qcsrc/server/g_world.qc
Simple merge