]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/monsters
authorMario <mario@smbclan.net>
Sun, 18 Jun 2017 06:01:03 +0000 (16:01 +1000)
committerMario <mario@smbclan.net>
Sun, 18 Jun 2017 06:01:03 +0000 (16:01 +1000)
commit54f63f7e208b41d4f4c348a319859c69ebdb9744
treea4db3ec9ff025329e062145093e6a694c5de3345
parentcb59b311300c40af8877478269e4e2cabc965529
parentbcb96b9e9c76f9731c2f7a51cfc1e8f236c57455
Merge branch 'master' into Mario/monsters

# Conflicts:
# qcsrc/server/defs.qh
qcsrc/common/constants.qh
qcsrc/common/triggers/func/breakable.qc
qcsrc/server/client.qc
qcsrc/server/defs.qh