Merge remote-tracking branch 'origin/Mario/flag_stuck_fix'
authorRudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:22:30 +0000 (11:22 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 4 Jun 2014 09:22:30 +0000 (11:22 +0200)
commitd4f1b4c3ccc42580f62b2d53161fc1bceed4d8b1
tree400bdba26526d18aa0b1d1e0312c3e1d81ae454b
parent447908b67ae80732c81613a4c822e4faaa5c8852
parenta1f6bbc269a4f8853b855ffd94993a7620d4c0b1
Merge remote-tracking branch 'origin/Mario/flag_stuck_fix'

* origin/Mario/flag_stuck_fix:
  Fix flag getting stuck on maps like tron with spawn in the ground and noalign key set, fix unmanned vehicles crashing the server in CTF