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)
commita733dd2cc67aaef9a9d9097bd1dc9b331aad72de
tree898a5f642c540d849ffb68b01ff66eb0c35d66a6
parent9806c5371ab60296b0696fe009d9ef8ddd51946f
parent29fc4f42055c7fe0b6e8ceb981d9af0415322a15
Merge remote-tracking branch 'origin/atheros/secret'
scripts/entities.def