Merge remote-tracking branch 'origin/divVerent/allow-override-item-model'
authorRudolf Polzer <divverent@alientrap.org>
Mon, 9 Jan 2012 20:54:32 +0000 (21:54 +0100)
committerRudolf Polzer <divverent@alientrap.org>
Mon, 9 Jan 2012 20:54:32 +0000 (21:54 +0100)
commita7b24450e4c7ca75636df1375d01d2266bd00c8c
tree182b239fc46ded1ff3b1e65fe59a2520c86689f0
parentac51af716204959703e1d10f1c1ad1b2c60beafa
parent2853aa9315226a1e8816ed8b792525d7e3420bc6
Merge remote-tracking branch 'origin/divVerent/allow-override-item-model'

Conflicts:
qcsrc/server/t_items.qc
defaultXonotic.cfg
qcsrc/server/t_items.qc