]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' into TimePath/csqc_sounds
authorTimePath <andrew.hardaker1995@gmail.com>
Mon, 16 Nov 2015 10:34:04 +0000 (21:34 +1100)
committerTimePath <andrew.hardaker1995@gmail.com>
Mon, 16 Nov 2015 10:34:04 +0000 (21:34 +1100)
# Conflicts:
# qcsrc/client/main.qc
# qcsrc/server/cl_player.qh

1  2 
qcsrc/client/main.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/lib/net.qh
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge