]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'master' into divVerent/4team_ctf
authorMario <mario.mario@y7mail.com>
Wed, 11 Sep 2013 07:22:42 +0000 (17:22 +1000)
committerMario <mario.mario@y7mail.com>
Wed, 11 Sep 2013 07:22:42 +0000 (17:22 +1000)
commit07790894d9c74e14bcd54cef20b34590250c49ec
treef51aa3030fd0222af4574eabf80fccf94616d2bb
parent1b3e50c4e9e9bb237378ce85c9125f895fc4c455
parentee678c2789ebd3622e987042e021e77cd370133d
Merge branch 'master' into divVerent/4team_ctf
qcsrc/client/hud.qc
qcsrc/client/waypointsprites.qc
qcsrc/common/items.qh
qcsrc/common/notifications.qh
qcsrc/server/mutators/gamemode_ca.qc
qcsrc/server/mutators/gamemode_ctf.qc