Merge remote-tracking branch 'origin/matthiaskrgr/respawnrings_texture'
authorRudolf Polzer <divverent@xonotic.org>
Sat, 13 Jul 2013 09:16:47 +0000 (11:16 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Sat, 13 Jul 2013 09:16:47 +0000 (11:16 +0200)
commit4e2a9eb4aad5152e3197d9e538c59a2c7b5be625
treee3f872cd5f24bbe1cee369086436ba8ff4455ecb
parent8923481ed1e161873aed35be47cfc847bb916d60
parent2f3e233d55f9e5950a6fe1032ea5bb23987233dd
Merge remote-tracking branch 'origin/matthiaskrgr/respawnrings_texture'