]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge branch 'master' of ssh://git.xonotic.org/xonotic-data.pk3dir
authorRudolf Polzer <divverent@alientrap.org>
Thu, 1 Sep 2011 11:22:40 +0000 (13:22 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Thu, 1 Sep 2011 11:22:40 +0000 (13:22 +0200)
1  2 
qcsrc/server/t_items.qc

Simple merge