]> 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: 7cbefc3 3319c56)
Merge remote-tracking branch 'origin/samual/kill_zoom_on_client', fixes #1439
authorRudolf Polzer <divverent@xonotic.org>
Thu, 21 Mar 2013 16:20:26 +0000 (17:20 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Thu, 21 Mar 2013 16:20:26 +0000 (17:20 +0100)

Trivial merge