]> git.rm.cloudns.org Git - xonotic/darkplaces.git/commitdiff
projects / xonotic / darkplaces.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 13c25b5 0715559)
Merge remote-tracking branch 'origin/master' into divVerent/anticheat-tricks
authorRudolf Polzer <divverent@xonotic.org>
Wed, 1 Aug 2012 07:49:22 +0000 (09:49 +0200)
committerRudolf Polzer <divverent@xonotic.org>
Wed, 1 Aug 2012 07:49:22 +0000 (09:49 +0200)

Trivial merge