]> git.rm.cloudns.org Git - xonotic/xonotic-data.pk3dir.git/commitdiff
projects / xonotic / xonotic-data.pk3dir.git / commitdiff
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: ed4db16 9c13562)
Merge branch 'master' into divVerent/rank-change
authorRudolf Polzer <divverent@xonotic.org>
Fri, 1 Feb 2013 11:57:54 +0000 (12:57 +0100)
committerRudolf Polzer <divverent@xonotic.org>
Fri, 1 Feb 2013 11:57:54 +0000 (12:57 +0100)

Trivial merge