]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
Merge remote-tracking branch 'origin/cbrutail/nexmodelfix'
authorRudolf Polzer <divverent@alientrap.org>
Sat, 3 Mar 2012 18:01:22 +0000 (19:01 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Sat, 3 Mar 2012 18:01:22 +0000 (19:01 +0100)
1  2 
scripts/weapons.shader

Simple merge