Merge remote branch 'origin/fruitiex/campaign'
authorRudolf Polzer <divVerent@xonotic.org>
Tue, 7 Dec 2010 10:08:31 +0000 (11:08 +0100)
committerRudolf Polzer <divVerent@xonotic.org>
Tue, 7 Dec 2010 10:08:31 +0000 (11:08 +0100)
commitfea194bd6a4ad1d3012998f7ba20f3a5c123d171
tree15d6d27cac4e161604bfa40428c90e95eaa70471
parent8e06b145226266e319973f3bca5c2da620fe4a53
parent1670a79d57800df804fc80f2723664ec5a699783
Merge remote branch 'origin/fruitiex/campaign'
qcsrc/server/teamplay.qc