]> de.git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote branch 'origin/fruitiex/precache_crosshair_ring'
authorRudolf Polzer <divverent@alientrap.org>
Tue, 12 Oct 2010 17:17:20 +0000 (19:17 +0200)
committerRudolf Polzer <divverent@alientrap.org>
Tue, 12 Oct 2010 17:17:20 +0000 (19:17 +0200)
1  2 
qcsrc/client/View.qc

Simple merge