]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
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)
1  2 
qcsrc/server/t_items.qc

Simple merge