]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
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)
commita0feb46a5f3f7db30054e67266e1c59f712f3da7
treefa5e9faa49dbea7d1c829a06bbb6c58663f14a95
parent2d79d9ed30444579f4a1e3205280eec945201b9f
parent29423d45cc63c4a88be57ceddff708a9c48d9fb1
Merge branch 'master' into TimePath/csqc_sounds

# Conflicts:
# qcsrc/client/main.qc
# qcsrc/server/cl_player.qh
qcsrc/client/main.qc
qcsrc/common/monsters/sv_monsters.qc
qcsrc/lib/net.qh
qcsrc/server/defs.qh
qcsrc/server/miscfunctions.qc