]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into Mario/ctf_updates
authorMario <mario.mario@y7mail.com>
Wed, 4 Jun 2014 22:46:04 +0000 (08:46 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 4 Jun 2014 22:46:04 +0000 (08:46 +1000)
commit43f2705555176d1c352e94ace1b9ea4d24e15434
tree6a38a1d204498a60a55202ebb23b70234af5774f
parent0f87afaf7ecbd7414d959ba1ea0789f51d8e43ec
parente69d5a700ec5451c172b8b0b9287a2625e45147c
Merge branch 'master' into Mario/ctf_updates
gamemodes.cfg
qcsrc/client/waypointsprites.qc
qcsrc/common/notifications.qh
qcsrc/server/autocvars.qh
qcsrc/server/mutators/gamemode_ctf.qc