Merge remote branch 'origin/mirceakitsune/red_planet_tempcollisions'
authorRudolf Polzer <divVerent@xonotic.org>
Sat, 27 Aug 2011 10:06:42 +0000 (12:06 +0200)
committerRudolf Polzer <divVerent@xonotic.org>
Sat, 27 Aug 2011 10:06:42 +0000 (12:06 +0200)
commit2ed50285f8715e23c44e85794cca2881c15c5cd8
tree02675a5936abbdc532eabc4251be3e153cb87bf3
parent6cdee6d8c644dd70aba060da78a6b656c247c385
parent37116ae033b1327a61e9a579ff1478479bda3ee4
Merge remote branch 'origin/mirceakitsune/red_planet_tempcollisions'