]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'refs/remotes/origin/terencehill/misc_bugfixes'
authorRudolf Polzer <divverent@alientrap.org>
Fri, 16 Jul 2010 21:43:11 +0000 (23:43 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Fri, 16 Jul 2010 21:43:11 +0000 (23:43 +0200)
1  2 
qcsrc/server/t_items.qc

Simple merge