]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/ons_updates
authorMario <mario.mario@y7mail.com>
Wed, 4 Jun 2014 21:35:24 +0000 (07:35 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 4 Jun 2014 21:35:24 +0000 (07:35 +1000)
commitf99b2cde35120861da80a023001d6f2cc2876030
treecaadfa70b987b185d8f00d3600cbb530adb51e20
parent66b13b7b5a480c901b6dacc84ff4374c38bdd6b3
parente69d5a700ec5451c172b8b0b9287a2625e45147c
Merge branch 'master' into Mario/ons_updates
gamemodes.cfg
qcsrc/client/Main.qc
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/bot/havocbot/havocbot.qc
qcsrc/server/bot/havocbot/roles.qc
qcsrc/server/g_damage.qc
qcsrc/server/teamplay.qc