Merge remote-tracking branch 'origin/atheros/secret'
authorRudolf Polzer <divverent@xonotic.org>
Thu, 27 Oct 2011 12:32:14 +0000 (14:32 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 27 Oct 2011 12:32:14 +0000 (14:32 +0200)
1  2 
scripts/entities.def

Simple merge