]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commit
Merge branch 'divVerent/timed-superweapons'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 13 Jan 2012 21:49:15 +0000 (22:49 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 13 Jan 2012 21:49:15 +0000 (22:49 +0100)
commit5eb33d999861a22adacb08d808421351b3291163
tree7c41e5be61abd9ca2e120be66f0c2b9489909b88
parent5f2cec8a51989ed75d5e1980d9a8198c8ad6ca22
parent886a501ad3280b2a964b9339819f8b1cdefb258f
Merge branch 'divVerent/timed-superweapons'
qcsrc/server/t_items.qc