]> git.xonotic.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 447908b a1f6bbc)
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)
* 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


Trivial merge